[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87cynuk6yf.fsf@mail.lhotse>
Date: Wed, 03 Jul 2024 22:15:04 +1000
From: Michael Ellerman <mpe@...erman.id.au>
To: Stephen Rothwell <sfr@...b.auug.org.au>, PowerPC
<linuxppc-dev@...ts.ozlabs.org>, Andrew Morton <akpm@...ux-foundation.org>
Cc: Christophe Leroy <christophe.leroy@...roup.eu>, Linux Kernel Mailing
List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
<linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the powerpc tree with the mm tree
Stephen Rothwell <sfr@...b.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/powerpc/mm/nohash/Makefile
>
...
> diff --cc arch/powerpc/mm/nohash/Makefile
> index 90e846f0c46c,86d0fe434824..000000000000
> --- a/arch/powerpc/mm/nohash/Makefile
> +++ b/arch/powerpc/mm/nohash/Makefile
> @@@ -1,8 -1,7 +1,7 @@@
> # SPDX-License-Identifier: GPL-2.0
>
> obj-y += mmu_context.o tlb.o tlb_low.o kup.o
> -obj-$(CONFIG_PPC_BOOK3E_64) += tlb_low_64e.o book3e_pgtable.o
> +obj-$(CONFIG_PPC_BOOK3E_64) += tlb_64e.o tlb_low_64e.o book3e_pgtable.o
> - obj-$(CONFIG_40x) += 40x.o
> obj-$(CONFIG_44x) += 44x.o
> obj-$(CONFIG_PPC_8xx) += 8xx.o
> obj-$(CONFIG_PPC_E500) += e500.o
Thanks, looks right.
cheers
Powered by blists - more mailing lists