From 8d0ce71c450cf90c7e70556e4cf8ae064df06391 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 14 Nov 2019 10:42:02 +0100 Subject: [PATCH] rebase patches on top of Ubuntu-5.3.0-24.26 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...pci-Enable-overrides-for-missing-ACS-capabilities-4..patch | 4 ++-- ...0004-kvm-disable-default-dynamic-halt-polling-growth.patch | 4 ++-- ...Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index eaa68e5..7dc09bd 100644 --- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 111 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 2d2b797cbaee..cf188fa76276 100644 +index bf529cbe68b9..13b285c23179 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3361,6 +3361,15 @@ +@@ -3386,6 +3386,15 @@ Also, it enforces the PCI Local Bus spec rule that those bits should be 0 in system reset events (useful for kexec/kdump cases). diff --git a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch index 81e1831..3c9aaa2 100644 --- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch @@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index c6a91b044d8d..aa972e4412f8 100644 +index 9d4e03eddccf..403eccb98d73 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c -@@ -75,7 +75,7 @@ module_param(halt_poll_ns, uint, 0644); +@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644); EXPORT_SYMBOL_GPL(halt_poll_ns); /* Default doubles per-vcpu halt_poll_ns. */ diff --git a/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch index 2dcbf27..e853f23 100644 --- a/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch +++ b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch @@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c -index 1d11bf4bab8b..175a432a7c09 100644 +index 2a0e281542cc..257896531139 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -103,7 +103,7 @@ module_param(enable_apicv, bool, S_IRUGO);