summaryrefslogtreecommitdiffstats
path: root/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-11-03 10:15:39 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-11-03 10:15:39 -0500
commita011ddd4b5885228de2005537824815a467d26ca (patch)
tree0d95cc3d51b761c9b4fa304101a86c9516ce0eae /MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
parent3b752c8c75943ec9feb71be1a64b6522989bcf75 (diff)
downloadkernel-a011ddd4b5885228de2005537824815a467d26ca.tar.gz
kernel-a011ddd4b5885228de2005537824815a467d26ca.tar.xz
kernel-a011ddd4b5885228de2005537824815a467d26ca.zip
Linux v3.18-rc3
- Disable debugging options.
Diffstat (limited to 'MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch')
-rw-r--r--MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
index b21a700a8..d0308704f 100644
--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@@ -42,10 +42,10 @@ index b1d686e9175e..4d41f4532127 100644
efi_guid_t guid;
u64 table;
diff --git a/init/Kconfig b/init/Kconfig
-index 0bba9555e5ef..0e1e8a14175a 100644
+index d99a519bb9ae..9ef459bb44b2 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1887,6 +1887,15 @@ config MODULE_SIG_ALL
+@@ -1901,6 +1901,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,7 +62,7 @@ index 0bba9555e5ef..0e1e8a14175a 100644
prompt "Which hash algorithm should modules be signed with?"
depends on MODULE_SIG
diff --git a/kernel/Makefile b/kernel/Makefile
-index dc5c77544fd6..95bdf3398880 100644
+index 17ea6d4a9a24..381fe2d56ed1 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_UID16) += uid16.o