From mboxrd@z Thu Jan 1 00:00:00 1970 From: Herbert Xu Subject: Re: linux-next: manual merge of the crypto tree with the amlogic tree Date: Wed, 5 Apr 2017 18:35:24 +0800 Message-ID: <20170405103524.GA25944@gondor.apana.org.au> References: <20170405102138.3ac22175@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20170405102138.3ac22175@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Kevin Hilman , Carlo Caione , Linux-Next Mailing List , Linux Kernel Mailing List , Heiner Kallweit , Neil Armstrong List-Id: linux-next.vger.kernel.org On Wed, Apr 05, 2017 at 10:21:38AM +1000, Stephen Rothwell wrote: > Hi Herbert, > > Today's linux-next merge of the crypto tree got a conflict in: > > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > > between commit: > > 6939db7e0dbf ("ARM64: dts: meson-gx: Add support for HDMI output") > > from the amlogic tree and commit: > > 1b3f6d148692 ("ARM64: dts: meson-gx: add clock CLKID_RNG0 to hwrng node") > > from the crypto 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. Looks good to me. Thanks Stephen. -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt