From 0054ae0629e3daa551d5594f6fbf88d3b6e79771 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 31 Aug 2020 10:34:18 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-5.4.0-46.50 (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 | 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 7e1f066..377414b 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 @@ -75,7 +75,7 @@ index 9c05c1fd8ed2..3fe28e536a56 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 eaa0036878a9..f0e4c36c4e8d 100644 +index 4b7034986223..5cfe37cdf1b4 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 eaa0036878a9..f0e4c36c4e8d 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 -@@ -4811,6 +4911,8 @@ static const struct pci_dev_acs_enabled { +@@ -4826,6 +4926,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/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch index e28330d..b3aaec6 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,7 +13,7 @@ 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 12813344373d..1560f78ad60e 100644 +index 62dae1d694a0..4abf33b6810d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);