aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-13 13:53:42 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-15 11:28:40 +0200
commitd3053b1bdc19f38f47f8e5664072ada2412bd3a0 (patch)
tree524d80f4b1c20eabe7c080f378249278fbfb7332 /target/linux/generic/backport-4.14
parentf053a8ce415da2e276dfd54288a02a98a819d09e (diff)
downloadupstream-d3053b1bdc19f38f47f8e5664072ada2412bd3a0.tar.gz
upstream-d3053b1bdc19f38f47f8e5664072ada2412bd3a0.tar.bz2
upstream-d3053b1bdc19f38f47f8e5664072ada2412bd3a0.zip
kernel: bump 4.14 to 4.14.118
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14')
-rw-r--r--target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
index 007b8315e5..9b33393c01 100644
--- a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
+++ b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
@@ -92,7 +92,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
#endif
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
-@@ -987,7 +987,7 @@ int br_nf_hook_thresh(unsigned int hook,
+@@ -988,7 +988,7 @@ int br_nf_hook_thresh(unsigned int hook,
unsigned int i;
int ret;