summaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-03-06 17:03:37 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2020-03-06 17:03:37 -0600
commit63849c8f410717eb2e6662f3953ff674727303e7 (patch)
tree1a72d4f2339ffc757f61f285d9083efd0c9ed8f7 /tools/testing
parent7e6582ef32f6cbd55b9c752727847b0ee6710e78 (diff)
parentf3a60268f5cec7dae0e9713f5fc65aecc3734c09 (diff)
downloadlinux-63849c8f410717eb2e6662f3953ff674727303e7.tar.bz2
Merge tag 'linux-kselftest-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest update from Shuah Khan: "This consists of a cleanup patch to undo changes to global .gitignore that added selftests/lkdtm objects and add them to a local selftests/lkdtm/.gitignore. Summary of Linus's comments on local vs. global gitignore scope: - Keep local gitignore patterns in local files. - Put only global gitignore patterns in the top-level gitignore file. Local scope keeps things much better separated. It also incidentally means that if a directory gets renamed, the gitignore file continues to work unless in the case of renaming the actual files themselves that are named in the gitignore" * tag 'linux-kselftest-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftest/lkdtm: Use local .gitignore
Diffstat (limited to 'tools/testing')
-rw-r--r--tools/testing/selftests/lkdtm/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/lkdtm/.gitignore b/tools/testing/selftests/lkdtm/.gitignore
new file mode 100644
index 000000000000..f26212605b6b
--- /dev/null
+++ b/tools/testing/selftests/lkdtm/.gitignore
@@ -0,0 +1,2 @@
+*.sh
+!run.sh