diff mbox series

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

Message ID 20250109104611.2491cc3b@canb.auug.org.au (mailing list archive)
State Not Applicable
Headers show
Series linux-next: manual merge of the powerpc tree with the mm tree | expand

Commit Message

Stephen Rothwell Jan. 8, 2025, 11:46 p.m. UTC 
Hi all,

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

  arch/powerpc/Kconfig

between commit:

  c0c3319917db ("mm: remove devmap related functions and page table bits")

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

  00199ed6f2ca ("powerpc: Add preempt lazy support")

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.
diff mbox series

Patch

diff --cc arch/powerpc/Kconfig
index 85409ec1fd83,db9f7b2d07bf..000000000000
--- a/arch/powerpc/Kconfig