From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jun 2020 17:04:47 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-kunit-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v5.8-rc1~81
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/595a56ac1b0d5f0a16a89589ef55ffd35c1967a2

Merge tag 'linux-kselftest-kunit-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kunit updates from Shuah Khan:
 "This consists of:

   - Several config fragment fixes from Anders Roxell to improve test
     coverage.

   - Improvements to kunit run script to use defconfig as default and
     restructure the code for config/build/exec/parse from Vitor Massaru
     Iha and David Gow.

   - Miscellaneous documentation warn fix"

* tag 'linux-kselftest-kunit-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  security: apparmor: default KUNIT_* fragments to KUNIT_ALL_TESTS
  fs: ext4: default KUNIT_* fragments to KUNIT_ALL_TESTS
  drivers: base: default KUNIT_* fragments to KUNIT_ALL_TESTS
  lib: Kconfig.debug: default KUNIT_* fragments to KUNIT_ALL_TESTS
  kunit: default KUNIT_* fragments to KUNIT_ALL_TESTS
  kunit: Kconfig: enable a KUNIT_ALL_TESTS fragment
  kunit: Fix TabError, remove defconfig code and handle when there is no kunitconfig
  kunit: use KUnit defconfig by default
  kunit: use --build_dir=.kunit as default
  Documentation: test.h - fix warnings
  kunit: kunit_tool: Separate out config/build/exec/parse
---

595a56ac1b0d5f0a16a89589ef55ffd35c1967a2
diff --cc fs/ext4/Kconfig
index cf9e430514c4,bc7815158503..1afa5a4bcb5f
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@@ -99,12 -99,14 +99,13 @@@ config EXT4_DEBU
  	  Enables run-time debugging support for the ext4 filesystem.
  
  	  If you select Y here, then you will be able to turn on debugging
 -	  with a command such as:
 -		echo 1 > /sys/module/ext4/parameters/mballoc_debug
 +	  using dynamic debug control for mb_debug() / ext_debug() msgs.
  
  config EXT4_KUNIT_TESTS
- 	tristate "KUnit tests for ext4"
+ 	tristate "KUnit tests for ext4" if !KUNIT_ALL_TESTS
  	select EXT4_FS
  	depends on KUNIT
+ 	default KUNIT_ALL_TESTS
  	help
  	  This builds the ext4 KUnit tests.