Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:4.18 commit in: /
Date: Fri, 17 Aug 2018 19:44:23
Message-Id: 1534535023.8cac435047b25399fa3486e339f23ddfb49da684.mpagano@gentoo
1 commit: 8cac435047b25399fa3486e339f23ddfb49da684
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 17 19:43:43 2018 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 17 19:43:43 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=8cac4350
7
8 Removal of redundant patch.
9
10 ix86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled
11
12 0000_README | 4 ---
13 1700_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 c801597..f72e2ad 100644
18 --- a/0000_README
19 +++ b/0000_README
20 @@ -59,10 +59,6 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch
21 From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/
22 Desc: Enable link security restrictions by default.
23
24 -Patch: 1700_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: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch
29 From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5
30 Desc: Add UAS disable quirk. See bug #640082.
31
32 diff --git a/1700_x86-l1tf-config-kvm-build-error-fix.patch b/1700_x86-l1tf-config-kvm-build-error-fix.patch
33 deleted file mode 100644
34 index 88c2ec6..0000000
35 --- a/1700_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 - {