summaryrefslogtreecommitdiffstats
path: root/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-11 09:17:16 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-11 09:17:16 -0500
commit1ef071e4db9c7521712667bb991dae3fa9dc90cb (patch)
tree2202620683d96ac918bebc4fb30f4af9dd963038 /MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
parent7681e91720563c3046df47d3fe585be3e441409a (diff)
downloadkernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.tar.gz
kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.tar.xz
kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.zip
Linux v3.19-463-g3e8c04eb1174
- Reenable debugging options. - Temporarily disable aarch64 patches
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 3789cd79c..10c47251b 100644
--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@@ -25,7 +25,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
create mode 100644 kernel/modsign_uefi.c
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index fb972b96959a..581878071c85 100644
+index f71d1700a187..9d3f61593d9a 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -595,6 +595,12 @@ void efi_native_runtime_setup(void);
@@ -42,10 +42,10 @@ index fb972b96959a..581878071c85 100644
efi_guid_t guid;
u64 table;
diff --git a/init/Kconfig b/init/Kconfig
-index ea0dbdf29b75..dac9ed0f01f7 100644
+index ac49b6e83436..5cdb1c323f62 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1896,6 +1896,15 @@ config MODULE_SIG_ALL
+@@ -1904,6 +1904,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