diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
| commit | 2a171788ba7bb61995e98e8163204fc7880f63b2 (patch) | |
| tree | 4150a94dd08323748116e5051e56ddee830d4812 /certs | |
| parent | bf5345882bd18bc1b4966d170c0491ebe5c9a7d6 (diff) | |
| parent | d4c2e9fca5b7db8d315d93a072e65d0847f8e0c5 (diff) | |
| download | linux-2a171788ba7bb61995e98e8163204fc7880f63b2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Files removed in 'net-next' had their license header updated
in 'net'. We take the remove from 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'certs')
| -rw-r--r-- | certs/Kconfig | 1 | ||||
| -rw-r--r-- | certs/Makefile | 1 | ||||
| -rw-r--r-- | certs/blacklist_hashes.c | 1 | ||||
| -rw-r--r-- | certs/blacklist_nohashes.c | 1 | ||||
| -rw-r--r-- | certs/system_certificates.S | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/certs/Kconfig b/certs/Kconfig index 6ce51ede9e9b..5f7663df6e8e 100644 --- a/certs/Kconfig +++ b/certs/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 menu "Certificates for signature checking" config MODULE_SIG_KEY diff --git a/certs/Makefile b/certs/Makefile index 847361ce14d1..5d0999b9e21b 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the linux kernel signature checking certificates. # diff --git a/certs/blacklist_hashes.c b/certs/blacklist_hashes.c index 5bd449f7db17..344892337be0 100644 --- a/certs/blacklist_hashes.c +++ b/certs/blacklist_hashes.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "blacklist.h" const char __initdata *const blacklist_hashes[] = { diff --git a/certs/blacklist_nohashes.c b/certs/blacklist_nohashes.c index 851de10706a5..73fd99098ad7 100644 --- a/certs/blacklist_nohashes.c +++ b/certs/blacklist_nohashes.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "blacklist.h" const char __initdata *const blacklist_hashes[] = { diff --git a/certs/system_certificates.S b/certs/system_certificates.S index c9ceb71a43fe..3918ff7235ed 100644 --- a/certs/system_certificates.S +++ b/certs/system_certificates.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <linux/export.h> #include <linux/init.h> |