Browse Source

rebase patches on top of Ubuntu-5.0.0-22.23

(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Thomas Lamprecht <[email protected]>
Thomas Lamprecht 6 years ago
parent
commit
f4beb2f868

+ 2 - 2
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 },

+ 1 - 1
patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch

@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <[email protected]>
  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);

+ 1 - 1
patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch

@@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <[email protected]>
  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);

+ 0 - 0
patches/kernel/0007-rbd-don-t-assert-on-writes-to-snapshots.patch → patches/kernel/0006-rbd-don-t-assert-on-writes-to-snapshots.patch