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

2019-09-02 Thread Michael Ellerman
Catalin Marinas writes: > On Mon, Sep 02, 2019 at 11:44:43AM +1000, Michael Ellerman wrote: >> Stephen Rothwell writes: >> > Hi all, >> > >> > Today's linux-next merge of the powerpc tree got a conflict in: >> > >> > arch/Kconfig >> > >> > between commit: >> > >> > 5cf896fb6be3 ("arm64: Add s

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

2019-09-02 Thread Will Deacon
On Mon, Sep 02, 2019 at 10:08:46AM +0100, Catalin Marinas wrote: > On Mon, Sep 02, 2019 at 11:44:43AM +1000, Michael Ellerman wrote: > > Stephen Rothwell writes: > > > Hi all, > > > > > > Today's linux-next merge of the powerpc tree got a conflict in: > > > > > > arch/Kconfig > > > > > > between

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

2019-09-02 Thread Catalin Marinas
On Mon, Sep 02, 2019 at 11:44:43AM +1000, Michael Ellerman wrote: > Stephen Rothwell writes: > > Hi all, > > > > Today's linux-next merge of the powerpc tree got a conflict in: > > > > arch/Kconfig > > > > between commit: > > > > 5cf896fb6be3 ("arm64: Add support for relocating the kernel with

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

2019-09-01 Thread Michael Ellerman
Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/Kconfig > > between commit: > > 5cf896fb6be3 ("arm64: Add support for relocating the kernel with RELR > relocations") > > from the arm64 tree and commit: > > 0c9c1d563975 ("x86, s

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

2019-09-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/Kconfig between commit: 5cf896fb6be3 ("arm64: Add support for relocating the kernel with RELR relocations") from the arm64 tree and commit: 0c9c1d563975 ("x86, s390: Move ARCH_HAS_MEM_ENCRYPT definition to ar