From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752777AbdLFOuA (ORCPT ); Wed, 6 Dec 2017 09:50:00 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:36663 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752166AbdLFOt5 (ORCPT ); Wed, 6 Dec 2017 09:49:57 -0500 X-ME-Sender: Date: Wed, 6 Dec 2017 15:50:04 +0100 From: Greg KH To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Xingyu Chen , Jonathan Cameron , Martin Blumenstingl Subject: Re: linux-next: manual merge of the staging tree with the staging.current tree Message-ID: <20171206145004.GA15868@kroah.com> References: <20171204125045.59e1a704@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171204125045.59e1a704@canb.auug.org.au> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 04, 2017 at 12:50:45PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/iio/adc/meson_saradc.c > > between commit: > > d85eed9f5763 ("iio: adc: meson-saradc: initialize the bandgap correctly on older SoCs") > > from the staging.current tree and commit: > > 930df4d853a8 ("iio: adc: meson-saradc: remove irrelevant clock "sana"") > > from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. This should now be resolved in my staging-next branch. thanks, greg k-h