aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pistachio/patches-4.14
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-04-16 00:00:49 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2018-04-16 00:22:57 +0300
commitec1d7b94616c392c28b8a51f1aa0c481cc6d92c8 (patch)
treef25b8ee10186d5d2677d9ad48108ae3768e3914f /target/linux/pistachio/patches-4.14
parent03774d28e1c12f24857cdb44a110df593cec42a6 (diff)
downloadupstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.gz
upstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.bz2
upstream-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/pistachio/patches-4.14')
-rw-r--r--target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 00686aaf37..eeb1e4dee8 100644
--- a/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-4.14/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2646,6 +2646,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2650,6 +2650,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret;
int i;
-@@ -2721,7 +2722,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -2725,7 +2726,12 @@ int spi_nor_scan(struct spi_nor *nor, co
spi_nor_wait_till_ready(nor);
}