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