diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 19:37:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 19:37:08 -0700 |
| commit | 3d15cfdb1b77536c205d8e49c0312219ddf162ec (patch) | |
| tree | 8615e83fc3765920be21e5bc2e157862b42d8d29 /tools/testing/selftests/ftrace | |
| parent | 5cd0911a9e0e408f28079a5e36a981217bf47520 (diff) | |
| parent | 6accd8e9bf22749f621fb7fb57995fa65f4cd873 (diff) | |
Merge tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
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
Diffstat (limited to 'tools/testing/selftests/ftrace')
| -rw-r--r-- | tools/testing/selftests/ftrace/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/ftrace/config b/tools/testing/selftests/ftrace/config new file mode 100644 index 000000000000..ef8214661612 --- /dev/null +++ b/tools/testing/selftests/ftrace/config @@ -0,0 +1 @@ +CONFIG_FTRACE=y |