Merge tag 'linux-kselftest-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel...

Pull Kselftest fixes from Shuah Khan:
 "Fixes for existing tests and the framework.

  Cristian Marussi's patches add the ability to skip targets (tests) and
  exclude tests that didn't build from run-list. These patches improve
  the Kselftest results. Ability to skip targets helps avoid running
  tests that aren't supported in certain environments. As an example,
  bpf tests from mainline aren't supported on stable kernels and have
  dependency on bleeding edge llvm. Being able to skip bpf on systems
  that can't meet this llvm dependency will be helpful.

  Kselftest can be built and installed from the main Makefile. This
  change help simplify Kselftest use-cases which addresses request from
  users.

  Kees Cook added per test timeout support to limit individual test
  run-time"

* tag 'linux-kselftest-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: watchdog: Add command line option to show watchdog_info
  selftests: watchdog: Validate optional file argument
  selftests/kselftest/runner.sh: Add 45 second timeout per test
  kselftest: exclude failed TARGETS from runlist
  kselftest: add capability to skip chosen TARGETS
  selftests: Add kselftest-all and kselftest-install targets

diff --combined Makefile
index f47dfdec7086e96086b7fef672e9f3acc4884474,02f7ede2f34477d82df5008ee50c83a5642373aa..c73922ad4d360e99432e2aeecbbc2e684fb46c27
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2,8 -2,8 +2,8 @@@
  VERSION = 5
  PATCHLEVEL = 4
  SUBLEVEL = 0
 -EXTRAVERSION = -rc1
 -NAME = Bobtail Squid
 +EXTRAVERSION = -rc2
 +NAME = Nesting Opossum
  
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
@@@ -206,8 -206,24 +206,8 @@@ ifndef KBUILD_CHECKSR
    KBUILD_CHECKSRC = 0
  endif
  
 -# Use make M=dir to specify directory of external module to build
 -# Old syntax make ... SUBDIRS=$PWD is still supported
 -# Setting the environment variable KBUILD_EXTMOD take precedence
 -ifdef SUBDIRS
 -  $(warning ================= WARNING ================)
 -  $(warning 'SUBDIRS' will be removed after Linux 5.3)
 -  $(warning )
 -  $(warning If you are building an individual subdirectory)
 -  $(warning in the kernel tree, you can do like this:)
 -  $(warning $$ make path/to/dir/you/want/to/build/)
 -  $(warning (Do not forget the trailing slash))
 -  $(warning )
 -  $(warning If you are building an external module,)
 -  $(warning Please use 'M=' or 'KBUILD_EXTMOD' instead)
 -  $(warning ==========================================)
 -  KBUILD_EXTMOD ?= $(SUBDIRS)
 -endif
 -
 +# Use make M=dir or set the environment variable KBUILD_EXTMOD to specify the
 +# directory of external module to build. Setting M= takes precedence.
  ifeq ("$(origin M)", "command line")
    KBUILD_EXTMOD := $(M)
  endif
@@@ -482,6 -498,7 +482,6 @@@ export CFLAGS_KASAN CFLAGS_KASAN_NOSANI
  export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
  export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
  export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
 -export KBUILD_ARFLAGS
  
  # Files to ignore in find ... statements
  
@@@ -897,6 -914,9 +897,6 @@@ ifdef CONFIG_RETPOLIN
  KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
  endif
  
 -# use the deterministic mode of AR if available
 -KBUILD_ARFLAGS := $(call ar-option,D)
 -
  include scripts/Makefile.kasan
  include scripts/Makefile.extrawarn
  include scripts/Makefile.ubsan
@@@ -1217,9 -1237,8 +1217,8 @@@ PHONY += kselftes
  kselftest:
        $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
  
- PHONY += kselftest-clean
- kselftest-clean:
-       $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean
+ kselftest-%: FORCE
+       $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
  
  PHONY += kselftest-merge
  kselftest-merge: