Hi all,

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

  lib/Kconfig.debug

between commit:

  e8a6a3f8fc19 ("tests/liveupdate: add in-kernel liveupdate test")

from the mm-nonmm-stable tree and commit:

  9b00c1609dee ("compiler-context-analysis: Add test stub")

from the tip 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 36564f85bc95,22ea11f24e92..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -2802,29 -2827,20 +2824,43 @@@ config LINEAR_RANGES_TES
  
  	  If unsure, say N.
  
 +config LIVEUPDATE_TEST
 +	bool "Live Update Kernel Test"
 +	default n
 +	depends on LIVEUPDATE
 +	help
 +	  Enable a built-in kernel test module for the Live Update
 +	  Orchestrator.
 +
 +	  This module validates the File-Lifecycle-Bound subsystem by
 +	  registering a set of mock FLB objects with any real file handlers
 +	  that support live update (such as the memfd handler).
 +
 +	  When live update operations are performed, this test module will
 +	  output messages to the kernel log (dmesg), confirming that its
 +	  registration and various callback functions (preserve, retrieve,
 +	  finish, etc.) are being invoked correctly.
 +
 +	  This is a debugging and regression testing tool for developers
 +	  working on the Live Update subsystem. It should not be enabled in
 +	  production kernels.
 +
 +	  If unsure, say N
 +
+ config CONTEXT_ANALYSIS_TEST
+ 	bool "Compiler context-analysis warnings test"
+ 	depends on EXPERT
+ 	help
+ 	  This builds the test for compiler-based context analysis. The test
+ 	  does not add executable code to the kernel, but is meant to test that
+ 	  common patterns supported by the analysis do not result in false
+ 	  positive warnings.
+ 
+ 	  When adding support for new context locks, it is strongly recommended
+ 	  to add supported patterns to this test.
+ 
+ 	  If unsure, say N.
+ 
  config CMDLINE_KUNIT_TEST
  	tristate "KUnit test for cmdline API" if !KUNIT_ALL_TESTS
  	depends on KUNIT