diff options
author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-04-16 00:00:49 +0300 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-04-16 00:22:57 +0300 |
commit | ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8 (patch) | |
tree | f25b8ee10186d5d2677d9ad48108ae3768e3914f /target/linux/ramips | |
parent | 03774d28e1c12f24857cdb44a110df593cec42a6 (diff) | |
download | openwrt-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.gz openwrt-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.bz2 openwrt-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.zip |
kernel: bump 4.14 to 4.14.34
Refresh patches.
Update patches that no longer apply:
- backport/313-netfilter-remove-defensive-check-on-malformed-packet.patch
- pending/642-net-8021q-support-hardware-flow-table-offload.patch
Compile-tested: x86/64.
Runtime-tested: x86/64.
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r-- | target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch | 2 | ||||
-rw-r--r-- | target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch b/target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch index 623eaf7291..7d3352e928 100644 --- a/target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch +++ b/target/linux/ramips/patches-4.14/0032-USB-dwc2-add-device_reset.patch @@ -18,7 +18,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> #include <linux/usb/hcd.h> #include <linux/usb/ch11.h> -@@ -5072,6 +5073,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso +@@ -5075,6 +5076,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso retval = -ENOMEM; diff --git a/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch b/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch index b8819e53e1..2e7cc33c8f 100644 --- a/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch +++ b/target/linux/ramips/patches-4.14/0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch @@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> { "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) }, -@@ -1220,6 +1272,9 @@ static int spi_nor_read(struct mtd_info +@@ -1224,6 +1276,9 @@ static int spi_nor_read(struct mtd_info if (ret) return ret; @@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> while (len) { loff_t addr = from; -@@ -1244,6 +1299,18 @@ static int spi_nor_read(struct mtd_info +@@ -1248,6 +1303,18 @@ static int spi_nor_read(struct mtd_info ret = 0; read_err: @@ -154,7 +154,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ); return ret; } -@@ -1345,6 +1412,10 @@ static int spi_nor_write(struct mtd_info +@@ -1349,6 +1416,10 @@ static int spi_nor_write(struct mtd_info if (ret) return ret; @@ -165,7 +165,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> for (i = 0; i < len; ) { ssize_t written; loff_t addr = to + i; -@@ -1385,6 +1456,7 @@ static int spi_nor_write(struct mtd_info +@@ -1389,6 +1460,7 @@ static int spi_nor_write(struct mtd_info } write_err: @@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE); return ret; } -@@ -2801,8 +2873,10 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -2805,8 +2877,10 @@ int spi_nor_scan(struct spi_nor *nor, co } else if (mtd->size > 0x1000000) { /* enable 4-byte addressing if the device exceeds 16MiB */ nor->addr_width = 4; |