Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux...

diff --cc MAINTAINERS
Simple merge

diff --cc include/kunit/test.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc rust/Makefile
index dda1aecb8161eee16fe65ac2a08ba1ae3bb63169,92482144c0bb9292e3ecf47b5fee691c7ba42775..68c8c5a79a51d0438b9193f51fe9d7ae760b1a19
--- 1/rust/Makefile
--- 2/rust/Makefile
+++ b/rust/Makefile
@@@ -157,9 -162,30 +165,30 @@@ quiet_cmd_rustdoc_test = RUSTDOC T $
                @$(objtree)/include/generated/rustc_cfg \
                $(rustc_target_flags) $(rustdoc_test_target_flags) \
                --sysroot $(objtree)/$(obj)/test/sysroot $(rustdoc_test_quiet) \
 -              -L$(objtree)/$(obj)/test --output $(objtree)/$(obj)/doc \
 +              -L$(objtree)/$(obj)/test --output $(rustdoc_output) \
                --crate-name $(subst rusttest-,,$@) $<
  
+ quiet_cmd_rustdoc_test_kernel = RUSTDOC TK $<
+       cmd_rustdoc_test_kernel = \
+       rm -rf $(objtree)/$(obj)/test/doctests/kernel; \
+       mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \
+       OBJTREE=$(abspath $(objtree)) \
+       $(RUSTDOC) --test $(rust_flags) \
+               @$(objtree)/include/generated/rustc_cfg \
+               -L$(objtree)/$(obj) --extern alloc --extern kernel \
+               --extern build_error --extern macros \
+               --extern bindings --extern uapi \
+               --no-run --crate-name kernel -Zunstable-options \
+               --test-builder $(objtree)/scripts/rustdoc_test_builder \
+               $< $(rustdoc_test_kernel_quiet); \
+       $(objtree)/scripts/rustdoc_test_gen
+ 
+ %/doctests_kernel_generated.rs %/doctests_kernel_generated_kunit.c: \
+     $(src)/kernel/lib.rs $(obj)/kernel.o \
+     $(objtree)/scripts/rustdoc_test_builder \
+     $(objtree)/scripts/rustdoc_test_gen FORCE
+       $(call if_changed,rustdoc_test_kernel)
+ 
  # We cannot use `-Zpanic-abort-tests` because some tests are dynamic,
  # so for the moment we skip `-Cpanic=abort`.
  quiet_cmd_rustc_test = RUSTC T  $<