aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-04 00:19:51 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-04 19:22:23 +0200
commitf4985a22ca1b46bbfa71dec4219b7fbeca2c0023 (patch)
tree964f8813945913a7eaba920bda6a40be30516364 /target/linux/lantiq
parent73fecd36bfd2b9f92a2a20f38bdb73b4433dec3e (diff)
downloadupstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.gz
upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.bz2
upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.zip
kernel: Update kernel 4.14 to version 4.14.187
Fixes: - CVE-2020-10757 Run tested: ath79, ipq40xx Build tested: ath79, ipq40xx Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch
index 9564577a04..671577f584 100644
--- a/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch
+++ b/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch
@@ -5505,7 +5505,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
unsigned long type);
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
-@@ -1061,6 +1061,12 @@
+@@ -1062,6 +1062,12 @@
#define PCI_DEVICE_ID_SGI_LITHIUM 0x1002
#define PCI_DEVICE_ID_SGI_IOC4 0x100a