aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-18 10:24:38 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-19 15:03:17 +0100
commit0a9147be6a5e920ea190c9a2bc35fe8e5d772693 (patch)
treeff08162ba173a8cfd9cb973d0ada77b2b74d6704 /target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
parentb9e685eed53e1ac98a080ed5d2516949d90467c9 (diff)
downloadupstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.tar.gz
upstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.tar.bz2
upstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.zip
kernel: bump 4.14 to 4.14.154
Refreshed all patches. Altered patches: - 902-debloat_proc.patch - 040-dmaengine-qcom-bam-Process-multiple-pending-descript.patch Remove upstreamed: - 303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch New symbols: X86_INTEL_MPX X86_INTEL_MEMORY_PROTECTION_KEYS X86_INTEL_TSX_MODE_OFF X86_INTEL_TSX_MODE_ON X86_INTEL_TSX_MODE_AUTO SGL_ALLOC Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch')
-rw-r--r--target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch b/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
index 632acc8a79..ec14929992 100644
--- a/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
+++ b/target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
@@ -14,7 +14,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
-@@ -968,7 +968,6 @@ enum nft_af_flags {
+@@ -969,7 +969,6 @@ enum nft_af_flags {
*
* @list: used internally
* @family: address family
@@ -22,7 +22,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* @owner: module owner
* @tables: used internally
* @flags: family flags
-@@ -976,7 +975,6 @@ enum nft_af_flags {
+@@ -977,7 +976,6 @@ enum nft_af_flags {
struct nft_af_info {
struct list_head list;
int family;