linux-next: manual merge of the rust-timekeeping tree with the rust tree

[Mark Brown <broonie@kernel.org>]

Hi all,


  rust/kernel/Kconfig.test

between commit:

  cd56a1c858ff3 ("rust: bug: add a KUnit test for warn_on!")

from the rust tree and commit:

  a9aba476d42df ("rust: time: add Delta::to_jiffies_timeout() for timeout conversion")

from the rust-timekeeping 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 --cc rust/kernel/Kconfig.test
index 966b07872ba15,0087749995d2b..0000000000000
--- a/rust/kernel/Kconfig.test
+++ b/rust/kernel/Kconfig.test
@@@ -83,12 -83,11 +83,18 @@@ config RUST_BITFIELD_KUNIT_TES
  
  	  If unsure, say N.
  
 +config RUST_BUG_KUNIT_TEST
 +	bool "KUnit tests for the Rust BUG/WARN functionality" if !KUNIT_ALL_TESTS
 +	depends on BUG
 +	default KUNIT_ALL_TESTS
 +	help
 +	  This option enables KUnit tests for the Rust BUG/WARN functionality.
++
+ config RUST_TIME_KUNIT_TEST
+ 	bool "KUnit tests for the Rust time API" if !KUNIT_ALL_TESTS
+ 	default KUNIT_ALL_TESTS
+ 	help
+ 	  This option enables KUnit tests for the Rust time API.
  	  These are only for development and testing, not for regular
  	  kernel use cases.