aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-03 21:22:08 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-05 15:02:47 +0200
commit1f8d9f70c259a5702c4a7646754ccad6add5d9ab (patch)
treee7738d25b01ffb9b31f3d5f7d4c01ca1d4c699b2 /target/linux/cns3xxx
parentd37f8a60f079d424901bc55ebd19e58505631c48 (diff)
downloadupstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.tar.gz
upstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.tar.bz2
upstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.zip
kernel: Update kernel 4.14 to version 4.14.187
Fixes: - CVE-2020-10757 Run tested: x86 Build tested: x86 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch b/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch
index ef7da9fe23..56f43295b4 100644
--- a/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch
+++ b/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch
@@ -1,6 +1,6 @@
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -2309,7 +2309,8 @@ static void pcie_write_mrrs(struct pci_d
+@@ -2330,7 +2330,8 @@ static void pcie_write_mrrs(struct pci_d
/* In the "safe" case, do not configure the MRRS. There appear to be
* issues with setting MRRS to 0 on a number of devices.
*/