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
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
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
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
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
5 matches
Mail list logo