diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-10-07 16:53:22 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-10-12 09:45:54 +0200 |
commit | 9c718b5478ac5df8ca4f27dbb70a6201c385aada (patch) | |
tree | e73b499786367a1f7b65a20cea640a09ac8e678f /target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch | |
parent | b21bea7b1b92abefad53bcfe509b7e44dd488c79 (diff) | |
download | upstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.tar.gz upstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.tar.bz2 upstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.zip |
kernel: bump 4.14 to 4.14.200
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch b/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch index a9f744fd13..6d5e4e7c6e 100644 --- a/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch +++ b/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch @@ -97,7 +97,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include "translation-table.h" --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c -@@ -49,6 +49,7 @@ +@@ -50,6 +50,7 @@ #include <net/genetlink.h> #include <net/netlink.h> #include <net/sock.h> @@ -105,7 +105,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include <uapi/linux/batman_adv.h> #include "hard-interface.h" -@@ -56,7 +57,6 @@ +@@ -57,7 +58,6 @@ #include "log.h" #include "netlink.h" #include "originator.h" |