diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 22:12:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 22:12:26 +0200 |
| commit | ff2ae607c6f329d11a3b0528801ea7474be8c3e9 (patch) | |
| tree | 670e6536e92033a828e827c3a067b26d81fb452d /sound | |
| parent | Merge tag 'for-linus-5.7-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ASoC: MT6660: make spdxcheck.py happy (diff) | |
| download | linux-ff2ae607c6f329d11a3b0528801ea7474be8c3e9.tar.xz linux-ff2ae607c6f329d11a3b0528801ea7474be8c3e9.zip | |
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 'sound')
| -rw-r--r-- | sound/oss/.gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/.gitignore b/sound/oss/.gitignore index 12a3920d6fb6..ac678430408b 100644 --- a/sound/oss/.gitignore +++ b/sound/oss/.gitignore @@ -1,3 +1,3 @@ -#Ignore generated files +# SPDX-License-Identifier: GPL-2.0-only pss_boot.h trix_boot.h |