rebase patches on top of Ubuntu-5.0.0-22.23

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

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2019-07-24 08:12:25 +02:00
parent a895eba453
commit f4beb2f868
4 changed files with 4 additions and 4 deletions
@@ -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 },