diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-10 12:41:32 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-10 14:45:11 +0200 |
| commit | f983956a8b724028cb9a0b7c9f3195e02e8a5b9e (patch) | |
| tree | 2de0b76f42c7848ca36c4bb0d2079867baeabfd6 /target/linux/generic/pending-4.14 | |
| parent | 571fe284641ebd7cce6387c3b5e50a8c872bc2e7 (diff) | |
| download | upstream-f983956a8b724028cb9a0b7c9f3195e02e8a5b9e.tar.gz upstream-f983956a8b724028cb9a0b7c9f3195e02e8a5b9e.tar.bz2 upstream-f983956a8b724028cb9a0b7c9f3195e02e8a5b9e.zip | |
kernel: bump 4.14 to 4.14.75
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14')
| -rw-r--r-- | target/linux/generic/pending-4.14/220-optimize_inlining.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.14/220-optimize_inlining.patch b/target/linux/generic/pending-4.14/220-optimize_inlining.patch index 1929d022f4..dca1dcb204 100644 --- a/target/linux/generic/pending-4.14/220-optimize_inlining.patch +++ b/target/linux/generic/pending-4.14/220-optimize_inlining.patch @@ -46,7 +46,7 @@ depends on DEBUG_KERNEL && !COMPILE_TEST --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -295,9 +295,6 @@ config ZONE_DMA32 +@@ -296,9 +296,6 @@ config ZONE_DMA32 config AUDIT_ARCH def_bool y if X86_64 diff --git a/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index 62ba525601..ad78b684a0 100644 --- a/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -4933,6 +4933,14 @@ static int nf_tables_flowtable_parse_hoo +@@ -4934,6 +4934,14 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) goto err1; @@ -521,7 +521,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ops = kzalloc(sizeof(struct nf_hook_ops) * n, GFP_KERNEL); if (!ops) { err = -ENOMEM; -@@ -5063,10 +5071,19 @@ static int nf_tables_newflowtable(struct +@@ -5064,10 +5072,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -541,7 +541,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -5164,7 +5181,8 @@ static int nf_tables_fill_flowtable_info +@@ -5165,7 +5182,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), |