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

Pull Kselftest updates from Shuah Khan:
 "This update for Kselftest adds:

   - A new feature to create test-specific kconfig fragments.  This
     feature helps configure Kselftests to test specific Kernel
     Configuration options as opposed to defconfig.

   - A new test for Media Controller API

   - A few fixes"

* tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: media_dcevice_test fix usage information
  selftests: media_dcevice_test fix to handle ioctl failure case
  selftests: add missing .gitignore file or entry
  Makefile: add kselftest-merge
  selftests: create test-specific kconfig fragments
  selftests: breakpoint: add step_after_suspend_test
  selftests: add a new test for Media Controller API

diff --combined Makefile
index 7b3ecdcdc6c1815ca6241a72b1967593a0335b41,42e3d1e111bb21529a591f7aaa3b9c95795264ec..6798c6b4775de48c949240dff1b6ac9f061251d4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 4
  PATCHLEVEL = 5
  SUBLEVEL = 0
 -EXTRAVERSION = -rc1
 +EXTRAVERSION =
  NAME = Blurry Fish Butt
  
  # *DOCUMENTATION*
@@@ -1087,6 -1087,14 +1087,14 @@@ kselftest
  kselftest-clean:
        $(Q)$(MAKE) -C tools/testing/selftests 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)$(MAKE) -f $(srctree)/Makefile olddefconfig
+ 
  # ---------------------------------------------------------------------------
  # Modules
  
@@@ -1295,6 -1303,8 +1303,8 @@@ help
        @echo  '                    Build, install, and boot kernel before'
        @echo  '                    running kselftest on it'
        @echo  '  kselftest-clean - Remove all generated kselftest files'
+       @echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existed'
+       @echo  '                    .config.'
        @echo  ''
        @echo  'Kernel packaging:'
        @$(MAKE) $(build)=$(package-dir) help