summaryrefslogtreecommitdiffstats
path: root/KEYS-Add-a-system-blacklist-keyring.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-20 09:32:10 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-20 09:32:10 -0500
commit2296e4a64733ab0d972c51b26cbaec734b11a5dd (patch)
tree5ac57de9b50d7f13eb55981d6cf80ff83b6d4375 /KEYS-Add-a-system-blacklist-keyring.patch
parent6bfe64015d0818752c85fffeea6291ad4edcca8f (diff)
downloadkernel-2296e4a64733ab0d972c51b26cbaec734b11a5dd.tar.gz
kernel-2296e4a64733ab0d972c51b26cbaec734b11a5dd.tar.xz
kernel-2296e4a64733ab0d972c51b26cbaec734b11a5dd.zip
Linux v3.19-8975-g3d883483dc0a
- Add patch to fix intermittent hangs in nouveau driver - Move mtpspi and related mods to kernel-core for VMWare guests (rhbz 1194612)
Diffstat (limited to 'KEYS-Add-a-system-blacklist-keyring.patch')
-rw-r--r--KEYS-Add-a-system-blacklist-keyring.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch
index e4de4be56..9feb8e9b4 100644
--- a/KEYS-Add-a-system-blacklist-keyring.patch
+++ b/KEYS-Add-a-system-blacklist-keyring.patch
@@ -29,7 +29,7 @@ index 72665eb80692..2c7b80d31366 100644
+
#endif /* _KEYS_SYSTEM_KEYRING_H */
diff --git a/init/Kconfig b/init/Kconfig
-index 058e3671fa11..ee83b7c6856c 100644
+index f5dbc6d4261b..eca8ab59ae7f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1734,6 +1734,15 @@ config SYSTEM_TRUSTED_KEYRING