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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 9 Oct 2024 16:27:19 +1100

Hi all,

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

  lib/Kconfig.debug

between commit:

  0f2016a962f0 ("lib/Kconfig.debug: move int_pow test option to runtime testing section")

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

  f099bda563dd ("lib: math: Move kunit tests into tests/ subdir")

from the kunit-next 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/Kconfig.debug
index 409dd193c09b,0d6c979f0bfd..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -2993,22 -2993,6 +2993,22 @@@ config TEST_OBJPOO
  
  	  If unsure, say N.
  
- config INT_POW_TEST
++config INT_POW_KUNIT_TEST
 +	tristate "Integer exponentiation (int_pow) test" if !KUNIT_ALL_TESTS
 +	depends on KUNIT
 +	default KUNIT_ALL_TESTS
 +	help
 +	  This option enables the KUnit test suite for the int_pow function,
 +	  which performs integer exponentiation. The test suite is designed to
 +	  verify that the implementation of int_pow correctly computes the power
 +	  of a given base raised to a given exponent.
 +
 +	  Enabling this option will include tests that check various scenarios
 +	  and edge cases to ensure the accuracy and reliability of the exponentiation
 +	  function.
 +
 +	  If unsure, say N
 +
  endif # RUNTIME_TESTING_MENU
  
  config ARCH_USE_MEMTEST