From 118616fd5f5ae9fb5fe27284a42bc20e779fbb8d Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 20 Aug 2019 17:13:36 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-5.0.0-26.27 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...i-Enable-overrides-for-missing-ACS-capabilities-4..patch | 6 +++--- ...04-kvm-disable-default-dynamic-halt-polling-growth.patch | 2 +- 2 files changed, 4 insertions(+), 4 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 5dfdc43..e48c13d 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,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 6de806c2e26c..a81214deec04 100644 +index b1645c11b384..2e19a7b0bea6 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3287,6 +3287,15 @@ @@ -75,7 +75,7 @@ index 6de806c2e26c..a81214deec04 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 c641af59dd41..67aeb07271fe 100644 +index 66eac47bbdd6..315e170523d8 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void) @@ -185,7 +185,7 @@ index c641af59dd41..67aeb07271fe 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 -@@ -4546,6 +4646,8 @@ static const struct pci_dev_acs_enabled { +@@ -4564,6 +4664,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 14090ac..bfe79b9 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 b5238bcba72c..45851daaadbf 100644 +index 4cc0d8a46891..c0a9369be8be 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644);