rebase patches on top of Ubuntu-5.4.0-78.87

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

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2021-06-23 13:30:20 +02:00
parent ac46634ed1
commit dd03250dc8
5 changed files with 8 additions and 8 deletions
@@ -55,7 +55,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 files changed, 111 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 9d66e884ebf5..37040e842a24 100644
index 359b54d2da21..00c9ace3711b 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3441,6 +3441,15 @@
@@ -75,7 +75,7 @@ index 9d66e884ebf5..37040e842a24 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 706f27a86a8e..c3eac7a5426e 100644
index 862038155fdf..78fb4b34c12d 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 706f27a86a8e..c3eac7a5426e 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
@@ -4825,6 +4925,8 @@ static const struct pci_dev_acs_enabled {
@@ -4828,6 +4928,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 },