From 35ac9a875942baf213b210ef2954da4fa0f3b463 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 10 Oct 2014 09:14:00 -0400 Subject: Linux v3.17-6136-gc798360cd143 --- KEYS-Add-a-system-blacklist-keyring.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'KEYS-Add-a-system-blacklist-keyring.patch') 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. -- cgit