kernel: bump 4.14 to 4.14.104

[openwrt/staging/wigyori.git] / 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 c3e63003dd7e7ba3c3303d161db0446039ff674a..1ca21db90c91d7bc8d528a6b796986d28983b32f 100644 (file)
--- 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 <biwen.li@nxp.com>
        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 <biwen.li@nxp.com>
  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,