rebase patches on top of Ubuntu-4.13.0-43.48

[pve-kernel.git] / patches / kernel / 0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch

diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
index 7084ff35b08104e57b8dabf10422156544be8b4f..56da886111d9d97de6410be3998dceca8b7b89aa 100644 (file)
--- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
+++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
@@ -1,8 +1,7 @@
-From e39d70502f7a981f821243160501303b7ee26d52 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Weiman <mark.weiman@markzz.com>
 Date: Sat, 29 Jul 2017 09:15:32 -0400
-Subject: [PATCH 3/6] pci: Enable overrides for missing ACS capabilities
- (4.12+)
+Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.12+)
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -55,10 +54,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  2 files changed, 111 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index f8ce2089146c..d4ace16bd59a 100644
+index ce24cb1e8f46..0cc1d4200c24 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -2918,6 +2918,15 @@
+@@ -2938,6 +2938,15 @@
                nomsi           [MSI] If the PCI_MSI kernel config parameter is
                                enabled, this kernel boot option can be used to
                                disable the use of MSI interrupts system-wide.
@@ -75,7 +74,7 @@ index f8ce2089146c..d4ace16bd59a 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 b7832fd4dbf4..f128ca4aea2b 100644
+index 99eec22d99b7..7576c2b0c913 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -3687,6 +3687,107 @@ static int __init pci_apply_final_quirks(void)
@@ -186,7 +185,7 @@ index b7832fd4dbf4..f128ca4aea2b 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
-@@ -4490,6 +4591,7 @@ static const struct pci_dev_acs_enabled {
+@@ -4529,6 +4630,7 @@ static const struct pci_dev_acs_enabled {
        { 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R */
        /* Cavium ThunderX */
        { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
@@ -195,5 +194,5 @@ index b7832fd4dbf4..f128ca4aea2b 100644
  };
  
 -- 
-2.11.0
+2.14.2