From 384f9c14cf1cb38597731a94aa59d3eb4841688d Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 23 Jun 2022 10:33:27 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-5.4.0-122.138 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...pci-Enable-overrides-for-missing-ACS-capabilities-4..patch | 4 ++-- ...Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch | 2 +- 2 files changed, 3 insertions(+), 3 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 0c9f9fc..d522cc9 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 101582659ce3..65985c44d8f9 100644 +index e2b4b44453d7..deb82a8df845 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3453,6 +3453,15 @@ +@@ -3489,6 +3489,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/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch index 4937ebc..05ae702 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 dd48f73fd9f1..bdec72312f5e 100644 +index 435dfebf5867..82c2afe46ebf 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);