diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:51:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:51:10 +0100 |
| commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
| tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /certs | |
| parent | x86/vector/msi: Select CONFIG_GENERIC_IRQ_RESERVATION_MODE (diff) | |
| parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.xz linux-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.zip | |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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> |