diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-16 10:55:18 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-16 10:55:18 -0400 |
| commit | 84326caccc8490832cb7df55177c1fe2d603b9c4 (patch) | |
| tree | ff4575dce4df4ecf08a768b20de9bfd8c9a3d32a /MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch | |
| parent | 6bfd0600ec390b1d339c46c9b4db5fa263f9fa38 (diff) | |
| download | kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.tar.gz kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.tar.xz kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.zip | |
Linux v4.0-6817-geea3a00264cf
Diffstat (limited to 'MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch')
| -rw-r--r-- | MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch index f2c19e463..bf630a2b5 100644 --- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch +++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -42,10 +42,10 @@ index 3dd6f4a51b9b..9cc069579351 100644 efi_guid_t guid; u64 table; diff --git a/init/Kconfig b/init/Kconfig -index 65e1bd0bc995..98af72b9a002 100644 +index 0eaa8278c87b..60ec329b1959 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1901,6 +1901,15 @@ config MODULE_SIG_ALL +@@ -1918,6 +1918,15 @@ config MODULE_SIG_ALL comment "Do not forget to sign required modules with scripts/sign-file" depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL @@ -62,10 +62,10 @@ index 65e1bd0bc995..98af72b9a002 100644 prompt "Which hash algorithm should modules be signed with?" depends on MODULE_SIG diff --git a/kernel/Makefile b/kernel/Makefile -index 1408b3353a3c..8a3be67a3a15 100644 +index 0f8f8b0bc1bf..cbe268943cee 100644 --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -46,6 +46,7 @@ obj-$(CONFIG_UID16) += uid16.o +@@ -48,6 +48,7 @@ obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_MODULE_SIG) += module_signing.o @@ -73,7 +73,7 @@ index 1408b3353a3c..8a3be67a3a15 100644 obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o obj-$(CONFIG_KEXEC) += kexec.o -@@ -99,6 +100,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o +@@ -101,6 +102,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o $(obj)/configs.o: $(obj)/config_data.h |