Skip to content

Commit 63849c8

Browse files
committed
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
2 parents 7e6582e + f3a6026 commit 63849c8

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ modules.order
100100
/include/ksym/
101101
/arch/*/include/generated/
102102

103-
# Generated lkdtm tests
104-
/tools/testing/selftests/lkdtm/*.sh
105-
!/tools/testing/selftests/lkdtm/run.sh
106-
107103
# stgit generated dirs
108104
patches-*
109105

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.sh
2+
!run.sh

0 commit comments

Comments
 (0)