From mboxrd@z Thu Jan 1 00:00:00 1970 From: dhdang@apm.com (Duc Dang) Date: Wed, 27 Jul 2016 13:41:41 -0700 Subject: linux-next: manual merge of the net-next tree with the arm-soc tree In-Reply-To: <20160727125342.1902ece1@canb.auug.org.au> References: <20160727125342.1902ece1@canb.auug.org.au> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Jul 26, 2016 at 7:53 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/arm64/boot/dts/apm/apm-shadowcat.dtsi > > between commit: > > cafc4cd0c8b8 ("arm64: dts: apm: Use lowercase consistently for hex constants") > > from the arm-soc tree and commit: > > 8e694cd2762c ("dtb: xgene: Add MDIO node") > > from the net-next 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. Thanks for taking care of this, Stephen. The fix looks fine. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/boot/dts/apm/apm-shadowcat.dtsi > index 21028b145d91,2e1e5daa1dc7..000000000000 > --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi > +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi > @@@ -628,9 -636,9 +636,9 @@@ > sgenet0: ethernet at 1f610000 { > compatible = "apm,xgene2-sgenet"; > status = "disabled"; > - reg = <0x0 0x1f610000 0x0 0x10000>, > + reg = <0x0 0x1f610000 0x0 0xd100>, > - <0x0 0x1f600000 0x0 0Xd100>, > - <0x0 0x20000000 0x0 0X20000>; > + <0x0 0x1f600000 0x0 0xd100>, > + <0x0 0x20000000 0x0 0x20000>; > interrupts = <0 96 4>, > <0 97 4>; > dma-coherent; Regards, Duc Dang.