Subject: linux-next: manual merge of the kspp tree with the kunit-next and mm trees

From: Stephen Rothwell <[email-masked]>
Date: Mon, 17 Mar 2025 21:39:53 +1100

Hi all,

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

  lib/Makefile

between commits:

  62f3802332ed ("vdso: add generic time data storage")

from the mm-unstable branch of the mm tree,

  c104c16073b7 ("Kunit to check the longest symbol length")

from the kunit-next tree and commit:

  db6fe4d61ece ("lib: Move KUnit tests into tests/ subdirectory")

from the kspp tree.

I fixed it up (see below and added a merge fix patch) 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.

From: Stephen Rothwell <[email-masked]>
Date: Mon, 17 Mar 2025 21:35:42 +1100
Subject: [PATCH] fix up 2 for "lib: Move KUnit tests into tests/ subdirectory"

interacting with commit

  c104c16073b7 ("Kunit to check the longest symbol length")

from the kunit-next tree.

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 lib/tests/Makefile                     | 2 ++
 lib/{ => tests}/longest_symbol_kunit.c | 0
 2 files changed, 2 insertions(+)
 rename lib/{ => tests}/longest_symbol_kunit.c (100%)

diff --git a/lib/tests/Makefile b/lib/tests/Makefile
index a434c7cb733a..f2c3c4f74608 100644
--- a/lib/tests/Makefile
+++ b/lib/tests/Makefile
@@ -20,6 +20,8 @@ CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE)
 obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o
 obj-$(CONFIG_HASHTABLE_KUNIT_TEST) += hashtable_test.o
 obj-$(CONFIG_HASH_KUNIT_TEST) += test_hash.o
+CFLAGS_longest_symbol_kunit.o += $(call cc-disable-warning, missing-prototypes)
+obj-$(CONFIG_LONGEST_SYM_KUNIT_TEST) += longest_symbol_kunit.o
 obj-$(CONFIG_TEST_IOV_ITER) += kunit_iov_iter.o
 obj-$(CONFIG_IS_SIGNED_TYPE_KUNIT_TEST) += is_signed_type_kunit.o
 obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
diff --git a/lib/longest_symbol_kunit.c b/lib/tests/longest_symbol_kunit.c
similarity index 100%
rename from lib/longest_symbol_kunit.c
rename to lib/tests/longest_symbol_kunit.c
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

diff --cc lib/Makefile
index 651811f5d677,89b8a4bce108..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -131,7 -119,7 +118,7 @@@ endi
  obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
  CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
  
- obj-y += math/ crypto/ vdso/
 -obj-y += math/ crypto/ tests/
++obj-y += math/ crypto/ vdso/ tests/
  
  obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
  obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o