From 6865b4eac1bb03ff9f4ae7cedb2f459075ee4430 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 15 May 2020 14:02:12 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-5.4.0-32.36 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...ch => 0002-bridge-keep-MAC-of-first-assigned-port.patch} | 0 ...-Enable-overrides-for-missing-ACS-capabilities-4..patch} | 6 +++--- ...4-kvm-disable-default-dynamic-halt-polling-growth.patch} | 0 ...ert-KVM-VMX-enable-nested-virtualization-by-defau.patch} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename patches/kernel/{0003-bridge-keep-MAC-of-first-assigned-port.patch => 0002-bridge-keep-MAC-of-first-assigned-port.patch} (100%) rename patches/kernel/{0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch => 0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch} (97%) rename patches/kernel/{0005-kvm-disable-default-dynamic-halt-polling-growth.patch => 0004-kvm-disable-default-dynamic-halt-polling-growth.patch} (100%) rename patches/kernel/{0006-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch => 0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch} (96%) diff --git a/patches/kernel/0003-bridge-keep-MAC-of-first-assigned-port.patch b/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch similarity index 100% rename from patches/kernel/0003-bridge-keep-MAC-of-first-assigned-port.patch rename to patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch diff --git a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch similarity index 97% rename from patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch rename to patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 33c9ae3..0997855 100644 --- a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -55,7 +55,7 @@ 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 174554924fb8..efa4a99121b7 100644 +index dc93d6b94d82..b9a5d6aa44fb 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3434,6 +3434,15 @@ @@ -75,7 +75,7 @@ index 174554924fb8..efa4a99121b7 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 8991b59c5c5b..86f6b7ae6fe6 100644 +index 25f5e253decd..0a0fd4db3908 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void) @@ -185,7 +185,7 @@ index 8991b59c5c5b..86f6b7ae6fe6 100644 /* * Decoding should be disabled for a PCI device during BAR sizing to avoid * conflict. But doing so may cause problems on host bridge and perhaps other -@@ -4764,6 +4864,8 @@ static const struct pci_dev_acs_enabled { +@@ -4796,6 +4896,8 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs }, /* APM X-Gene */ { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, diff --git a/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch similarity index 100% rename from patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch rename to patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch diff --git a/patches/kernel/0006-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch similarity index 96% rename from patches/kernel/0006-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch rename to patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch index 5c01659..403531c 100644 --- a/patches/kernel/0006-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 39a116d43993..25ecb53517eb 100644 +index 72f51275247e..597fe6f70d97 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);