rebase patches on top of Ubuntu-4.15.0-46.49

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

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2019-02-06 11:07:36 +01:00
parent a7aea31f47
commit 322691b072
3 changed files with 4 additions and 147 deletions
@@ -54,7 +54,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2 files changed, 110 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 51210d10d905..ceb1b471d249 100644
index 43b61d87c9a3..00bc6786e6e0 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3067,6 +3067,15 @@
@@ -74,10 +74,10 @@ index 51210d10d905..ceb1b471d249 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 facd0d08a380..6ed8f3ead0dd 100644
index 2956ebbd83dc..8dceb0838970 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3703,6 +3703,106 @@ static int __init pci_apply_final_quirks(void)
@@ -3705,6 +3705,106 @@ static int __init pci_apply_final_quirks(void)
fs_initcall_sync(pci_apply_final_quirks);
@@ -184,7 +184,7 @@ index facd0d08a380..6ed8f3ead0dd 100644
/*
* Following are device-specific reset methods which can be used to
* reset a single function if other methods (e.g. FLR, PM D0->D3) are
@@ -4542,6 +4642,7 @@ static const struct pci_dev_acs_enabled {
@@ -4558,6 +4658,7 @@ 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 },