Merge branch 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel...

[thirdparty/kernel/stable.git] / Makefile

diff --git a/Makefile b/Makefile
index 1232a1454d5c71961980df2f4225bcdaf432e9c0..b81e1726125077a2c1bf2d4141e65596f2510528 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
-PATCHLEVEL = 1
+PATCHLEVEL = 2
 SUBLEVEL = 0
-EXTRAVERSION =
-NAME = Shy Crocodile
+EXTRAVERSION = -rc4
+NAME = Golden Lions
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
@@ -1228,9 +1228,8 @@ kselftest-clean:
 PHONY += kselftest-merge
 kselftest-merge:
        $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
-       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
-               -m $(objtree)/.config \
-               $(srctree)/tools/testing/selftests/*/config
+       $(Q)find $(srctree)/tools/testing/selftests -name config | \
+               xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config
        +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
 
 # ---------------------------------------------------------------------------