diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 23:12:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 23:12:26 +0300 |
| commit | ff2ae607c6f329d11a3b0528801ea7474be8c3e9 (patch) | |
| tree | 670e6536e92033a828e827c3a067b26d81fb452d /security | |
| parent | 6cd3d4019ba3f45aa1a87e4e914e81d367b59937 (diff) | |
| parent | 71db3aa2816da62a2d150ad9fa81168537db4037 (diff) | |
| download | linux-ff2ae607c6f329d11a3b0528801ea7474be8c3e9.tar.xz | |
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 'security')
| -rw-r--r-- | security/apparmor/.gitignore | 4 | ||||
| -rw-r--r-- | security/selinux/.gitignore | 1 | ||||
| -rw-r--r-- | security/tomoyo/.gitignore | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/security/apparmor/.gitignore b/security/apparmor/.gitignore index d5b291e94264..6d1eb1c15c18 100644 --- a/security/apparmor/.gitignore +++ b/security/apparmor/.gitignore @@ -1,6 +1,4 @@ -# -# Generated include files -# +# SPDX-License-Identifier: GPL-2.0-only net_names.h capability_names.h rlim_names.h diff --git a/security/selinux/.gitignore b/security/selinux/.gitignore index 2e5040a3d48b..168fae13ca5a 100644 --- a/security/selinux/.gitignore +++ b/security/selinux/.gitignore @@ -1,2 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only av_permissions.h flask.h diff --git a/security/tomoyo/.gitignore b/security/tomoyo/.gitignore index dc0f220a210b..9f300cdce362 100644 --- a/security/tomoyo/.gitignore +++ b/security/tomoyo/.gitignore @@ -1,2 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only builtin-policy.h policy/*.conf |