rebase patches on top of Ubuntu-5.4.0-95.107

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

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2022-01-12 18:43:49 +01:00
parent 6d27ecc907
commit 86127be35d
3 changed files with 6 additions and 6 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 623eed9d3009..cc43987a3238 100644
index 66d570dde754..c2c522ac579a 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3447,6 +3447,15 @@
@@ -75,7 +75,7 @@ index 623eed9d3009..cc43987a3238 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 76f8ecd4e3f0..de76601eb079 100644
index 4bb0cae64a35..5f16701fb23d 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void)
@@ -185,7 +185,7 @@ index 76f8ecd4e3f0..de76601eb079 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
@@ -4944,6 +5044,8 @@ static const struct pci_dev_acs_enabled {
@@ -4945,6 +5045,8 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
/* APM X-Gene */
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },