From f4beb2f868f6185771851e232266b2ed280adc7f Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 24 Jul 2019 08:12:25 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-5.0.0-22.23 (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 +- ...Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch | 2 +- ...tch => 0006-rbd-don-t-assert-on-writes-to-snapshots.patch} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename patches/kernel/{0007-rbd-don-t-assert-on-writes-to-snapshots.patch => 0006-rbd-don-t-assert-on-writes-to-snapshots.patch} (100%) 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 fff419e..5dfdc43 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 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 9ced8797ec1d..a9860b97e616 100644 +index c641af59dd41..67aeb07271fe 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 9ced8797ec1d..a9860b97e616 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 -@@ -4549,6 +4649,8 @@ static const struct pci_dev_acs_enabled { +@@ -4546,6 +4646,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 3e30c3c..14090ac 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 b4f2d892a1d3..414fcd130126 100644 +index b5238bcba72c..45851daaadbf 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644); 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 7e5c8df..cd3599d 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 f14248f584b3..3c0972eb9e93 100644 +index df6e325b288b..2874cb9c41f5 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -106,7 +106,7 @@ module_param(enable_apicv, bool, S_IRUGO); diff --git a/patches/kernel/0007-rbd-don-t-assert-on-writes-to-snapshots.patch b/patches/kernel/0006-rbd-don-t-assert-on-writes-to-snapshots.patch similarity index 100% rename from patches/kernel/0007-rbd-don-t-assert-on-writes-to-snapshots.patch rename to patches/kernel/0006-rbd-don-t-assert-on-writes-to-snapshots.patch