linux-next: manual merge of the asm-generic tree with the mm tree

Stephen Rothwell
2024-10-28T22:55:35Z

[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]

Hi all,

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

lib/Makefile

between commit:

2ff14c29323d ("lib/Makefile: make union-find compilation conditional on CONFIG_CPUSETS")

from the mm tree and commit:

b660d0a2acb9 ("New implementation for IO memcpy and IO memset")

from the asm-generic 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 lib/Makefile
index 1eb89962daef,db4717538fad..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -35,12 -35,10 +35,12 @@@ lib-y := ctype.o string.o vsprintf.o cm
is_single_threaded.o plist.o decompress.o kobject_uevent.o \
earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
nmi_backtrace.o win_minmax.o memcat_p.o \
- buildid.o objpool.o
- buildid.o objpool.o union_find.o iomem_copy.o
++ buildid.o objpool.o iomem_copy.o

+lib-$(CONFIG_UNION_FIND) += union_find.o
lib-$(CONFIG_PRINTK) += dump_stack.o
lib-$(CONFIG_SMP) += cpumask.o
+lib-$(CONFIG_MIN_HEAP) += min_heap.o

lib-y += kobject.o klist.o
obj-y += lockref.o