summaryrefslogtreecommitdiffstats
path: root/KEYS-Add-a-system-blacklist-keyring.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
commit35ac9a875942baf213b210ef2954da4fa0f3b463 (patch)
treee2ed984e81584a9a89cac4ba17a8e7ee65f690aa /KEYS-Add-a-system-blacklist-keyring.patch
parentc01ddf0dcd7e42362ea1be6489b7da7500032c24 (diff)
downloadkernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.gz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.xz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.zip
Linux v3.17-6136-gc798360cd143
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 7bbda8d5e..98df75570 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 e25a82a291a6..2d90498c77d7 100644
+index d2355812ba48..4fcd7dd882c2 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1733,6 +1733,15 @@ config SYSTEM_TRUSTED_KEYRING
+@@ -1722,6 +1722,15 @@ config SYSTEM_TRUSTED_KEYRING
Keys in this keyring are used by module signature checking.