diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
commit | 6a50f368784f29b0772f265a05b9e395bb2c23ff (patch) | |
tree | 80faccf654cbbaae2a0a74686db514f663623bb2 /efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch | |
parent | 498236e304bc3f3c936ef937b2a101b9e22f6544 (diff) | |
download | kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.gz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.xz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.zip |
Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143)
- Fix errant with_perf disable that removed perf entirely (rhbz 1237266)
Diffstat (limited to 'efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch')
-rw-r--r-- | efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch index c6f735195..c80869cd3 100644 --- a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch +++ b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch @@ -11,10 +11,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 0ea05e5528c9..df0d6d8603fb 100644 +index 6c218407e987..536e884ee923 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1693,7 +1693,8 @@ config EFI_MIXED +@@ -1697,7 +1697,8 @@ config EFI_MIXED If unsure, say N. config EFI_SECURE_BOOT_SIG_ENFORCE |