diff --git a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 87cd3f1..f69c4e3 100644 --- a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -55,7 +55,7 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 111 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 2e77ecc12692..eae6fdc4c683 100644 +index c06b0d7abcbb..c0d8867359bc 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4188,6 +4188,15 @@ @@ -75,7 +75,7 @@ index 2e77ecc12692..eae6fdc4c683 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 267e6002e29f..fac76ca1d16a 100644 +index e84378684643..0bfa7199c974 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 267e6002e29f..fac76ca1d16a 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 -@@ -4959,6 +5059,8 @@ static const struct pci_dev_acs_enabled { +@@ -4972,6 +5072,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 }, diff --git a/submodules/ubuntu-kernel b/submodules/ubuntu-kernel index d3bf8f1..1978bab 160000 --- a/submodules/ubuntu-kernel +++ b/submodules/ubuntu-kernel @@ -1 +1 @@ -Subproject commit d3bf8f1da09634a8b4e661d022702ead6c0dadfb +Subproject commit 1978bab71596981268838efebf801f03fdce9d3a