commit: 8cac435047b25399fa3486e339f23ddfb49da684 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Fri Aug 17 19:43:43 2018 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Fri Aug 17 19:43:43 2018 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=8cac4350
Removal of redundant patch. ix86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled 0000_README | 4 --- 1700_x86-l1tf-config-kvm-build-error-fix.patch | 40 -------------------------- 2 files changed, 44 deletions(-) diff --git a/0000_README b/0000_README index c801597..f72e2ad 100644 --- a/0000_README +++ b/0000_README @@ -59,10 +59,6 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default. -Patch: 1700_x86-l1tf-config-kvm-build-error-fix.patch -From: http://www.kernel.org -Desc: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled - Patch: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5 Desc: Add UAS disable quirk. See bug #640082. diff --git a/1700_x86-l1tf-config-kvm-build-error-fix.patch b/1700_x86-l1tf-config-kvm-build-error-fix.patch deleted file mode 100644 index 88c2ec6..0000000 --- a/1700_x86-l1tf-config-kvm-build-error-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 Mon Sep 17 00:00:00 2001 -From: Guenter Roeck <li...@roeck-us.net> -Date: Wed, 15 Aug 2018 08:38:33 -0700 -Subject: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled - -From: Guenter Roeck <li...@roeck-us.net> - -commit 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 upstream. - -allmodconfig+CONFIG_INTEL_KVM=n results in the following build error. - - ERROR: "l1tf_vmx_mitigation" [arch/x86/kvm/kvm.ko] undefined! - -Fixes: 5b76a3cff011 ("KVM: VMX: Tell the nested hypervisor to skip L1D flush on vmentry") -Reported-by: Meelis Roos <mr...@linux.ee> -Cc: Meelis Roos <mr...@linux.ee> -Cc: Paolo Bonzini <pbonz...@redhat.com> -Cc: Thomas Gleixner <t...@linutronix.de> -Signed-off-by: Guenter Roeck <li...@roeck-us.net> -Signed-off-by: Linus Torvalds <torva...@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> - ---- - arch/x86/kernel/cpu/bugs.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/arch/x86/kernel/cpu/bugs.c -+++ b/arch/x86/kernel/cpu/bugs.c -@@ -648,10 +648,9 @@ void x86_spec_ctrl_setup_ap(void) - enum l1tf_mitigations l1tf_mitigation __ro_after_init = L1TF_MITIGATION_FLUSH; - #if IS_ENABLED(CONFIG_KVM_INTEL) - EXPORT_SYMBOL_GPL(l1tf_mitigation); -- -+#endif - enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_AUTO; - EXPORT_SYMBOL_GPL(l1tf_vmx_mitigation); --#endif - - static void __init l1tf_select_mitigation(void) - {
