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/336-v4.15-netfilter-exit_net-cleanup-check-added.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/336-v4.15-netfilter-exit_net-cleanup-check-added.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch b/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch index 406b15d820..d331593496 100644 --- a/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch +++ b/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch @@ -21,7 +21,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static struct pernet_operations clusterip_net_ops = { --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -6544,6 +6544,12 @@ static int __net_init nf_tables_init_net +@@ -6563,6 +6563,12 @@ static int __net_init nf_tables_init_net return 0; } @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> int __nft_release_basechain(struct nft_ctx *ctx) { struct nft_rule *rule, *nr; -@@ -6621,6 +6627,7 @@ static void __nft_release_afinfo(struct +@@ -6640,6 +6646,7 @@ static void __nft_release_afinfo(struct static struct pernet_operations nf_tables_net_ops = { .init = nf_tables_init_net, |