From f442b306f9b74e805828d458ab412256d7709ffb Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 20 May 2019 10:31:41 +0200 Subject: kernel: bump 4.14 to 4.14.120 Refreshed all patches. Remove upstreamed: - 103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch - 060-fix-oxnas-rps-dt-match.patch 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: ar71xx, cns3xxx, imx6, mvebu, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte --- ...v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch') diff --git a/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch b/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch index f4c3a48ead..8f7d11bd67 100644 --- a/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch +++ b/target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch @@ -151,7 +151,7 @@ Signed-off-by: Pablo Neira Ayuso static int __init nf_tables_ipv6_init(void) --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -1386,7 +1386,6 @@ static int nf_tables_addchain(struct nft +@@ -1398,7 +1398,6 @@ static int nf_tables_addchain(struct nft if (nla[NFTA_CHAIN_HOOK]) { struct nft_chain_hook hook; struct nf_hook_ops *ops; @@ -159,7 +159,7 @@ Signed-off-by: Pablo Neira Ayuso err = nft_chain_parse_hook(net, nla, afi, &hook, create); if (err < 0) -@@ -1412,7 +1411,6 @@ static int nf_tables_addchain(struct nft +@@ -1424,7 +1423,6 @@ static int nf_tables_addchain(struct nft static_branch_inc(&nft_counters_enabled); } @@ -167,7 +167,7 @@ Signed-off-by: Pablo Neira Ayuso basechain->type = hook.type; chain = &basechain->chain; -@@ -1421,10 +1419,8 @@ static int nf_tables_addchain(struct nft +@@ -1433,10 +1431,8 @@ static int nf_tables_addchain(struct nft ops->hooknum = hook.num; ops->priority = hook.priority; ops->priv = chain; -- cgit v1.2.3