diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-20 10:32:50 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-21 09:48:48 +0200 |
commit | 68a5e662c213f6499b87a38766eae3eb95424062 (patch) | |
tree | f2275e7e3c99a61e30dc6ea2532f928f62fcee45 /target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch | |
parent | 85294fc5e7012130d3b23a5b23f44a12affa715f (diff) | |
download | upstream-68a5e662c213f6499b87a38766eae3eb95424062.tar.gz upstream-68a5e662c213f6499b87a38766eae3eb95424062.tar.bz2 upstream-68a5e662c213f6499b87a38766eae3eb95424062.zip |
kernel: bump 4.14 to 4.14.120
Refreshed all patches.
Altered patches:
- 0067-generic-Mangle-bootloader-s-kernel-arguments.patch
- 006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
- 996-generic-Mangle-bootloader-s-kernel-arguments.patch
Compile-tested on: cns3xxx, imx6, mvebu
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch b/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch index 784368520d..01ee106a4c 100644 --- a/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch +++ b/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch @@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> WARN_ON(!nf_flow_offload_gc_step(flow_table)); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -4990,23 +4990,6 @@ static const struct nf_flowtable_type *n +@@ -5009,23 +5009,6 @@ static const struct nf_flowtable_type *n return ERR_PTR(-ENOENT); } |