summaryrefslogtreecommitdiffstats
path: root/KEYS-Add-a-system-blacklist-keyring.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-06 09:00:35 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-06 09:00:35 -0400
commite8a3eb7d294c94b9aba76f6f936568b65355fd2c (patch)
treebb30f804c46f3c69fc5bfa606b070a5a033c83f8 /KEYS-Add-a-system-blacklist-keyring.patch
parentb25a5034bae7ef4779218d7e4eae9b95a065da04 (diff)
downloadkernel-e8a3eb7d294c94b9aba76f6f936568b65355fd2c.tar.gz
kernel-e8a3eb7d294c94b9aba76f6f936568b65355fd2c.tar.xz
kernel-e8a3eb7d294c94b9aba76f6f936568b65355fd2c.zip
Linux v3.17
Diffstat (limited to 'KEYS-Add-a-system-blacklist-keyring.patch')
-rw-r--r--KEYS-Add-a-system-blacklist-keyring.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch
index ca6eb84eb..17ef25bf1 100644
--- a/KEYS-Add-a-system-blacklist-keyring.patch
+++ b/KEYS-Add-a-system-blacklist-keyring.patch
@@ -29,10 +29,10 @@ index 72665eb80692..2c7b80d31366 100644
+
#endif /* _KEYS_SYSTEM_KEYRING_H */
diff --git a/init/Kconfig b/init/Kconfig
-index e84c6423a2e5..223b1a32bbcb 100644
+index 80a6907f91c5..dfdd7f738247 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1720,6 +1720,15 @@ config SYSTEM_TRUSTED_KEYRING
+@@ -1723,6 +1723,15 @@ config SYSTEM_TRUSTED_KEYRING
Keys in this keyring are used by module signature checking.