From 16d89ef291f796fdd3f9424bad01de512d8bc637 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 7 Aug 2018 10:34:37 +0200 Subject: kernel: bump 4.14 to 4.14.61 Refreshed all patches. Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte (backported from commit 7a254aeeb8a9ca7e2846af6ed508f5ec21db350d) --- target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/mediatek/patches-4.14') diff --git a/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch b/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch index 5c4edec077..926e0d8421 100644 --- a/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch +++ b/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch @@ -249,7 +249,7 @@ --- a/net/dsa/slave.c +++ b/net/dsa/slave.c -@@ -1257,7 +1257,7 @@ int dsa_slave_create(struct dsa_port *po +@@ -1263,7 +1263,7 @@ int dsa_slave_create(struct dsa_port *po int ret; cpu_dp = ds->dst->cpu_dp; @@ -258,7 +258,7 @@ if (!ds->num_tx_queues) ds->num_tx_queues = 1; -@@ -1295,6 +1295,7 @@ int dsa_slave_create(struct dsa_port *po +@@ -1301,6 +1301,7 @@ int dsa_slave_create(struct dsa_port *po p->dp = port; INIT_LIST_HEAD(&p->mall_tc_list); p->xmit = dst->tag_ops->xmit; -- cgit v1.2.3