From 1cfbf95393decf047900e1b66b076a030704db20 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 27 Feb 2019 17:07:48 +0100 Subject: kernel: bump 4.14 to 4.14.104 Refreshed all patches. Altered patches: - 332-arc-add-OWRTDTB-section.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../layerscape/patches-4.14/202-core-linux-support-layerscape.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch') diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index c3e63003dd..1ca21db90c 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -106,7 +106,7 @@ Signed-off-by: Biwen Li case '-': --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c -@@ -1932,7 +1932,8 @@ static int team_netpoll_setup(struct net +@@ -1921,7 +1921,8 @@ static int team_netpoll_setup(struct net } #endif @@ -263,7 +263,7 @@ Signed-off-by: Biwen Li int bond_set_carrier(struct bonding *bond); --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c -@@ -874,7 +874,8 @@ free_bat_counters: +@@ -876,7 +876,8 @@ free_bat_counters: * Return: 0 if successful or error otherwise. */ static int batadv_softif_slave_add(struct net_device *dev, -- cgit v1.2.3