[GIT,PULL] Kselftest kunit update for Linux 5.6-rc5
diff mbox series

Message ID 4d298617-f061-dda0-bde0-901c48247b4a@linuxfoundation.org
State Mainlined
Commit 63849c8f410717eb2e6662f3953ff674727303e7
Headers show
Series
  • [GIT,PULL] Kselftest kunit update for Linux 5.6-rc5
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.6-rc5

Commit Message

Shuah Khan March 6, 2020, 10:57 p.m. UTC
Hi Linus,

Please pull the following Keselftest update for Linux 5.6-rc5.

This Kselftest update for Linux 5.6-rc5 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.

Diff is attached.

I took the liberty to include summary of your comments on local vs
global gitignore scope in the commit message.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit ef89d0545132d685f73da6f58b7e7fe002536f91:

   selftests/rseq: Fix out-of-tree compilation (2020-02-20 08:57:12 -0700)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest 
tags/linux-kselftest-5.6-rc5

for you to fetch changes up to f3a60268f5cec7dae0e9713f5fc65aecc3734c09:

   selftest/lkdtm: Use local .gitignore (2020-03-02 08:39:39 -0700)

----------------------------------------------------------------
linux-kselftest-5.6-rc5

This Kselftest update for Linux 5.6-rc5 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.

----------------------------------------------------------------
Christophe Leroy (1):
       selftest/lkdtm: Use local .gitignore

  .gitignore                               | 4 ----
  tools/testing/selftests/lkdtm/.gitignore | 2 ++
  2 files changed, 2 insertions(+), 4 deletions(-)
  create mode 100644 tools/testing/selftests/lkdtm/.gitignore

----------------------------------------------------------------

Comments

pr-tracker-bot@kernel.org March 6, 2020, 11:10 p.m. UTC | #1
The pull request you sent on Fri, 6 Mar 2020 15:57:27 -0700:

> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.6-rc5

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/63849c8f410717eb2e6662f3953ff674727303e7

Thank you!

Patch
diff mbox series

diff --git a/.gitignore b/.gitignore
index 2763fce8766c..72ef86a5570d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,10 +100,6 @@  modules.order
 /include/ksym/
 /arch/*/include/generated/
 
-# Generated lkdtm tests
-/tools/testing/selftests/lkdtm/*.sh
-!/tools/testing/selftests/lkdtm/run.sh
-
 # stgit generated dirs
 patches-*
 
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