diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-06 16:34:35 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-06 16:34:35 -0400 |
commit | 088a50c52e6f720fdbd321871fb3e30e241508c5 (patch) | |
tree | 1a71348d2e970f1d6f8a1f824935e54d64d00040 /KEYS-Add-a-system-blacklist-keyring.patch | |
parent | 55b5c15b8f0c65f111c9fb61b839024d0502798c (diff) | |
download | kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.gz kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.xz kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.zip |
Linux v4.2-rc1
- Disable debug options.
- Add patch to fix perf build
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 b50b39e6c..fe06d51b9 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 7d1ffd2ae536..a3f17e13603c 100644 +index af09b4fb43d2..62f6fd191e4f 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1751,6 +1751,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1752,6 +1752,15 @@ config SYSTEM_TRUSTED_KEYRING Keys in this keyring are used by module signature checking. |