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

2021-02-18 Thread Michael Ellerman
Rob Herring writes: > On Thu, Feb 18, 2021 at 5:34 AM Stephen Rothwell > wrote: >> On Thu, 18 Feb 2021 21:44:37 +1100 Michael Ellerman >> wrote: >> > >> > I think it just needs this? >> > >> > diff --git a/arch/powerpc/kexec/elf_64.c b/arch/powerpc/kexec/elf_64.c >> > index 87e34611f93d..0492c

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

2021-02-18 Thread Stephen Rothwell
Hi all, On Thu, 18 Feb 2021 07:52:52 -0600 Rob Herring wrote: > > On Thu, Feb 18, 2021 at 5:34 AM Stephen Rothwell > wrote: > > > > On Thu, 18 Feb 2021 21:44:37 +1100 Michael Ellerman > > wrote: > > > > > > I think it just needs this? > > > > > > diff --git a/arch/powerpc/kexec/elf_64.c b/a

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

2021-02-18 Thread Rob Herring
On Thu, Feb 18, 2021 at 5:34 AM Stephen Rothwell wrote: > > Hi Michael, > > On Thu, 18 Feb 2021 21:44:37 +1100 Michael Ellerman > wrote: > > > > I think it just needs this? > > > > diff --git a/arch/powerpc/kexec/elf_64.c b/arch/powerpc/kexec/elf_64.c > > index 87e34611f93d..0492ca6003f3 100644

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

2021-02-18 Thread Stephen Rothwell
Hi Michael, On Thu, 18 Feb 2021 21:44:37 +1100 Michael Ellerman wrote: > > I think it just needs this? > > diff --git a/arch/powerpc/kexec/elf_64.c b/arch/powerpc/kexec/elf_64.c > index 87e34611f93d..0492ca6003f3 100644 > --- a/arch/powerpc/kexec/elf_64.c > +++ b/arch/powerpc/kexec/elf_64.c > @@

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

2021-02-18 Thread Michael Ellerman
Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the devicetree tree got a conflict in: > > arch/powerpc/kexec/elf_64.c > > between commit: > > 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump > kernel") > > from the powerpc tree and commit: > > 130b2d5

linux-next: manual merge of the devicetree tree with the powerpc tree

2021-02-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the devicetree tree got a conflict in: arch/powerpc/kexec/elf_64.c between commit: 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump kernel") from the powerpc tree and commit: 130b2d59cec0 ("powerpc: Use common of_kexec_alloc_and_se

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

2012-03-14 Thread Gavin Shan
>> > +#if defined(CONFIG_EEH) >> > > +static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node >> > > *dn) >> > > +{ >> > > + return dn->edev; >> > > +} >> > > +#endif >> > >> > Ben, What is this? I don't want the eeh_dev pointer in struct >> > device_node. Up to >> > now we'

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

2012-03-14 Thread Benjamin Herrenschmidt
On Wed, 2012-03-14 at 09:53 +0800, Gavin Shan wrote: > > +#if defined(CONFIG_EEH) > > > +static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node *dn) > > > +{ > > > + return dn->edev; > > > +} > > > +#endif > > > > Ben, What is this? I don't want the eeh_dev pointer in struct d

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

2012-03-13 Thread Gavin Shan
Hi Grant, > > > > Today's linux-next merge of the devicetree tree got a conflict in > > include/linux/of.h between commit eb740b5f3e65 ("powerpc/eeh: Introduce > > EEH device") from the powerpc tree and commit 0f22dd395fc4 ("of: Only > > compile OF_DYNAMIC on PowerPC pseries and iseries") from th

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

2012-03-13 Thread Grant Likely
On Tue, 13 Mar 2012 16:01:00 +1100, Stephen Rothwell wrote: > Hi Grant, > > Today's linux-next merge of the devicetree tree got a conflict in > include/linux/of.h between commit eb740b5f3e65 ("powerpc/eeh: Introduce > EEH device") from the powerpc tree and commit 0f22dd395fc4 ("of: Only > compil

linux-next: manual merge of the devicetree tree with the powerpc tree

2012-03-12 Thread Stephen Rothwell
Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in include/linux/of.h between commit eb740b5f3e65 ("powerpc/eeh: Introduce EEH device") from the powerpc tree and commit 0f22dd395fc4 ("of: Only compile OF_DYNAMIC on PowerPC pseries and iseries") from the devicetree tree. J

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

2012-02-27 Thread Grant Likely
On Mon, Feb 27, 2012 at 7:06 PM, Stephen Rothwell wrote: > Hi Grant, > > Today's linux-next merge of the devicetree tree got a conflict in > arch/powerpc/platforms/iseries/Kconfig between commit 3d066d77cf46 > ("powerpc: remove CONFIG_PPC_ISERIES from the architecture Kconfig > files") from the po

linux-next: manual merge of the devicetree tree with the powerpc tree

2012-02-27 Thread Stephen Rothwell
Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in arch/powerpc/platforms/iseries/Kconfig between commit 3d066d77cf46 ("powerpc: remove CONFIG_PPC_ISERIES from the architecture Kconfig files") from the powerpc tree and commit 0f22dd395fc4 ("of: Only compile OF_DYNAMIC on P