summaryrefslogtreecommitdiffstats
path: root/KEYS-Add-a-system-blacklist-keyring.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-14 10:54:21 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-14 10:54:21 -0400
commit7f1b8a88fb1168d40d9c812ca4d71ba3655c9115 (patch)
treef5a34fd374b9d43c0bf6bb08ad0a6ee27ab6fc9a /KEYS-Add-a-system-blacklist-keyring.patch
parentff180079f148953e56d8bac03c582df5e3343e45 (diff)
downloadkernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.gz
kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.xz
kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.zip
Linux v3.17-9283-g2d65a9f48fcd
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 6e1f3015c..0f02211a4 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 1c505e090422..4fb572ae7423 100644
+index 3ee28ae02cc8..0bba9555e5ef 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1732,6 +1732,15 @@ config SYSTEM_TRUSTED_KEYRING
+@@ -1733,6 +1733,15 @@ config SYSTEM_TRUSTED_KEYRING
Keys in this keyring are used by module signature checking.