diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-08 12:10:10 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-08 12:10:33 -0400 |
| commit | da99f20f026faababa016afb0c23cc8af405f4ee (patch) | |
| tree | a3accab6d05f4367a2a50875dab9f6999de2b82e /KEYS-Add-a-system-blacklist-keyring.patch | |
| parent | ce8e218a5e0856615ab3d25219fe73a576faa213 (diff) | |
| download | kernel-da99f20f026faababa016afb0c23cc8af405f4ee.tar.gz kernel-da99f20f026faababa016afb0c23cc8af405f4ee.tar.xz kernel-da99f20f026faababa016afb0c23cc8af405f4ee.zip | |
Linux v3.17-2860-gef0625b70dac
- Reenable debugging options.
- Temporarily disable aarch64patches
Diffstat (limited to 'KEYS-Add-a-system-blacklist-keyring.patch')
| -rw-r--r-- | KEYS-Add-a-system-blacklist-keyring.patch | 4 |
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 17ef25bf1..7bbda8d5e 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 80a6907f91c5..dfdd7f738247 100644 +index e25a82a291a6..2d90498c77d7 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1723,6 +1723,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1733,6 +1733,15 @@ config SYSTEM_TRUSTED_KEYRING Keys in this keyring are used by module signature checking. |