From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756892AbcBWBga (ORCPT ); Mon, 22 Feb 2016 20:36:30 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:44266 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756583AbcBWBg1 (ORCPT ); Mon, 22 Feb 2016 20:36:27 -0500 X-Sasl-enc: deTjdiJjECs3J6vyMR6Cp4SmgZR7cQFcB0Q3A4h8X/KK 1456191386 Date: Mon, 22 Feb 2016 17:36:25 -0800 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shraddha Barke , Christoffer Dall , Jason Hu Subject: Re: linux-next: manual merge of the char-misc tree with the staging tree Message-ID: <20160223013625.GA761@kroah.com> References: <20160216135548.6da63be6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160216135548.6da63be6@canb.auug.org.au> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 16, 2016 at 01:55:48PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/platform/goldfish/goldfish_pipe.c > > between commit: > > 1d427da1d7f9 ("Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version") > > from the staging tree and commits: > > 2f3be88237a3 ("goldfish_pipe: Pin pages to memory while copying and other cleanups") > d62f324b0ac8 ("goldfish: Enable ACPI-based enumeration for android pipe") > > from the char-misc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks for letting me know. I've now pulled in the char-misc tree into staging due to the confusion that was happening with this driver, people were modifying it in both repos, so now everything should be synced up. thanks, greg k-h