diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 13:12:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 13:12:26 -0700 |
| commit | ff2ae607c6f329d11a3b0528801ea7474be8c3e9 (patch) | |
| tree | 670e6536e92033a828e827c3a067b26d81fb452d /kernel | |
| parent | 6cd3d4019ba3f45aa1a87e4e914e81d367b59937 (diff) | |
| parent | 71db3aa2816da62a2d150ad9fa81168537db4037 (diff) | |
Merge tag 'spdx-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull SPDX updates from Greg KH:
"Here are three SPDX patches for 5.7-rc1.
One fixes up the SPDX tag for a single driver, while the other two go
through the tree and add SPDX tags for all of the .gitignore files as
needed.
Nothing too complex, but you will get a merge conflict with your
current tree, that should be trivial to handle (one file modified by
two things, one file deleted.)
All three of these have been in linux-next for a while, with no
reported issues other than the merge conflict"
* tag 'spdx-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
ASoC: MT6660: make spdxcheck.py happy
.gitignore: add SPDX License Identifier
.gitignore: remove too obvious comments
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/.gitignore | 4 | ||||
| -rw-r--r-- | kernel/debug/kdb/.gitignore | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/.gitignore b/kernel/.gitignore index 34d1e77ee9df..78701ea37c97 100644 --- a/kernel/.gitignore +++ b/kernel/.gitignore @@ -1,6 +1,4 @@ -# -# Generated files -# +# SPDX-License-Identifier: GPL-2.0-only kheaders.md5 timeconst.h hz.bc diff --git a/kernel/debug/kdb/.gitignore b/kernel/debug/kdb/.gitignore index 396d12eda9e8..df259542a236 100644 --- a/kernel/debug/kdb/.gitignore +++ b/kernel/debug/kdb/.gitignore @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only gen-kdb_cmds.c |