| 1 |
commit: 4b86d5a2e2a3a350b298b8391a5052ae93c582b7 |
| 2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 17 19:36:32 2018 +0000 |
| 4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 17 19:36:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=4b86d5a2 |
| 7 |
|
| 8 |
Removal of redundant patch: |
| 9 |
|
| 10 |
x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled |
| 11 |
|
| 12 |
0000_README | 4 --- |
| 13 |
1705_x86-l1tf-config-kvm-build-error-fix.patch | 40 -------------------------- |
| 14 |
2 files changed, 44 deletions(-) |
| 15 |
|
| 16 |
diff --git a/0000_README b/0000_README |
| 17 |
index 41f1d75..614d36d 100644 |
| 18 |
--- a/0000_README |
| 19 |
+++ b/0000_README |
| 20 |
@@ -311,10 +311,6 @@ Patch: 1700_ia64_fix_ptrace.patch |
| 21 |
From: https://patchwork.kernel.org/patch/10198159/ |
| 22 |
Desc: ia64: fix ptrace(PTRACE_GETREGS) (unbreaks strace, gdb). |
| 23 |
|
| 24 |
-Patch: 1705_x86-l1tf-config-kvm-build-error-fix.patch |
| 25 |
-From: http://www.kernel.org |
| 26 |
-Desc: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled |
| 27 |
- |
| 28 |
Patch: 2100_bcache-data-corruption-fix-for-bi-partno.patch |
| 29 |
From: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=62530ed8b1d07a45dec94d46e521c0c6c2d476e6 |
| 30 |
Desc: bio: ensure __bio_clone_fast copies bi_partno. |
| 31 |
|
| 32 |
diff --git a/1705_x86-l1tf-config-kvm-build-error-fix.patch b/1705_x86-l1tf-config-kvm-build-error-fix.patch |
| 33 |
deleted file mode 100644 |
| 34 |
index 88c2ec6..0000000 |
| 35 |
--- a/1705_x86-l1tf-config-kvm-build-error-fix.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,40 +0,0 @@ |
| 38 |
-From 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 Mon Sep 17 00:00:00 2001 |
| 39 |
-From: Guenter Roeck <linux@××××××××.net> |
| 40 |
-Date: Wed, 15 Aug 2018 08:38:33 -0700 |
| 41 |
-Subject: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled |
| 42 |
- |
| 43 |
-From: Guenter Roeck <linux@××××××××.net> |
| 44 |
- |
| 45 |
-commit 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 upstream. |
| 46 |
- |
| 47 |
-allmodconfig+CONFIG_INTEL_KVM=n results in the following build error. |
| 48 |
- |
| 49 |
- ERROR: "l1tf_vmx_mitigation" [arch/x86/kvm/kvm.ko] undefined! |
| 50 |
- |
| 51 |
-Fixes: 5b76a3cff011 ("KVM: VMX: Tell the nested hypervisor to skip L1D flush on vmentry") |
| 52 |
-Reported-by: Meelis Roos <mroos@×××××.ee> |
| 53 |
-Cc: Meelis Roos <mroos@×××××.ee> |
| 54 |
-Cc: Paolo Bonzini <pbonzini@××××××.com> |
| 55 |
-Cc: Thomas Gleixner <tglx@××××××××××.de> |
| 56 |
-Signed-off-by: Guenter Roeck <linux@××××××××.net> |
| 57 |
-Signed-off-by: Linus Torvalds <torvalds@××××××××××××××××.org> |
| 58 |
-Signed-off-by: Greg Kroah-Hartman <gregkh@×××××××××××××××.org> |
| 59 |
- |
| 60 |
---- |
| 61 |
- arch/x86/kernel/cpu/bugs.c | 3 +-- |
| 62 |
- 1 file changed, 1 insertion(+), 2 deletions(-) |
| 63 |
- |
| 64 |
---- a/arch/x86/kernel/cpu/bugs.c |
| 65 |
-+++ b/arch/x86/kernel/cpu/bugs.c |
| 66 |
-@@ -648,10 +648,9 @@ void x86_spec_ctrl_setup_ap(void) |
| 67 |
- enum l1tf_mitigations l1tf_mitigation __ro_after_init = L1TF_MITIGATION_FLUSH; |
| 68 |
- #if IS_ENABLED(CONFIG_KVM_INTEL) |
| 69 |
- EXPORT_SYMBOL_GPL(l1tf_mitigation); |
| 70 |
-- |
| 71 |
-+#endif |
| 72 |
- enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_AUTO; |
| 73 |
- EXPORT_SYMBOL_GPL(l1tf_vmx_mitigation); |
| 74 |
--#endif |
| 75 |
- |
| 76 |
- static void __init l1tf_select_mitigation(void) |
| 77 |
- { |
Archives