summaryrefslogtreecommitdiffstats
path: root/KEYS-Add-a-system-blacklist-keyring.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 /KEYS-Add-a-system-blacklist-keyring.patch
parent3b752c8c75943ec9feb71be1a64b6522989bcf75 (diff)
downloadkernel-a011ddd4b5885228de2005537824815a467d26ca.tar.gz
kernel-a011ddd4b5885228de2005537824815a467d26ca.tar.xz
kernel-a011ddd4b5885228de2005537824815a467d26ca.zip
Linux v3.18-rc3
- Disable debugging options.
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 0f02211a4..34f1563b9 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 3ee28ae02cc8..0bba9555e5ef 100644
+index 2081a4d3d917..d99a519bb9ae 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1733,6 +1733,15 @@ config SYSTEM_TRUSTED_KEYRING
+@@ -1747,6 +1747,15 @@ config SYSTEM_TRUSTED_KEYRING
Keys in this keyring are used by module signature checking.