diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-03 10:54:16 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-03 16:10:38 +0200 |
commit | f960490fc8f9c347021868f6bd0ed1a078fc6da2 (patch) | |
tree | 3c998c1eabd8f3341c47a2227a334e495ce7ccf5 /target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch | |
parent | 4ec4dd2a118d124123e20a7af7958ba7d30785fe (diff) | |
download | upstream-f960490fc8f9c347021868f6bd0ed1a078fc6da2.tar.gz upstream-f960490fc8f9c347021868f6bd0ed1a078fc6da2.tar.bz2 upstream-f960490fc8f9c347021868f6bd0ed1a078fc6da2.zip |
kernel: bump 4.14 to 4.14.60
Refreshed all patches
Removed upstreamed patches:
- 500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch
Compile-tested on: cns3xxx, imx6, x86_64
Runtime-tested on: cns3xxx, imx6, x86_64
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 5c942e3a54..0d973ac028 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 -@@ -6522,6 +6522,12 @@ static int __net_init nf_tables_init_net +@@ -6523,6 +6523,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; -@@ -6599,6 +6605,7 @@ static void __nft_release_afinfo(struct +@@ -6600,6 +6606,7 @@ static void __nft_release_afinfo(struct static struct pernet_operations nf_tables_net_ops = { .init = nf_tables_init_net, |