diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-11 09:17:16 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-11 09:17:16 -0500 |
commit | 1ef071e4db9c7521712667bb991dae3fa9dc90cb (patch) | |
tree | 2202620683d96ac918bebc4fb30f4af9dd963038 /KEYS-Add-a-system-blacklist-keyring.patch | |
parent | 7681e91720563c3046df47d3fe585be3e441409a (diff) | |
download | kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.tar.gz kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.tar.xz kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.zip |
Linux v3.19-463-g3e8c04eb1174
- Reenable debugging options.
- Temporarily disable aarch64 patches
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 d1a77cfc8..6b7b932d2 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 9afb971497f4..ea0dbdf29b75 100644 +index 1354ac09b516..ac49b6e83436 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1742,6 +1742,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1750,6 +1750,15 @@ config SYSTEM_TRUSTED_KEYRING Keys in this keyring are used by module signature checking. |