Subject: linux-next: manual merge of the powerpc tree with the mm tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 3 Jul 2024 09:48:57 +1000

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in:

  arch/powerpc/mm/nohash/Makefile

between commit:

  9e49846e4d65 ("powerpc/64e: split out nohash Book3E 64-bit code")

from the mm-unstable branch of the mm tree and commit:

  732b32daef80 ("powerpc: Remove core support for 40x")

from the powerpc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

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