Re: linux-next: manual merge of the devicetree tree with the arm-soc tree

2020-05-22 Thread Arnd Bergmann
On Fri, May 22, 2020 at 8:03 AM Stephen Rothwell wrote: > 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.

Re: linux-next: manual merge of the devicetree tree with the arm-soc tree

2014-03-13 Thread Grant Likely
On Wed, 12 Mar 2014 15:36:58 -0700, Olof Johansson wrote: > On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown wrote: > > Hi Grant, > > > > Today's linux-next merge of the devicetree tree got a conflict in > > include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM: > > Introduce CPU_M

Re: linux-next: manual merge of the devicetree tree with the arm-soc tree

2014-03-12 Thread Olof Johansson
On Wed, Mar 12, 2014 at 3:03 PM, Mark Brown wrote: > Hi Grant, > > Today's linux-next merge of the devicetree tree got a conflict in > include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM: > Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the tree and > commit f

Re: linux-next: manual merge of the devicetree tree with the arm-soc tree

2014-01-16 Thread Jason Cooper
Stephen, On Fri, Jan 17, 2014 at 02:08:53PM +1100, Stephen Rothwell wrote: > Hi Grant, > > Today's linux-next merge of the devicetree tree got a conflict in > arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings: > Remove all references to device_type "ethernet-phy"") and b31b32