diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-18 10:24:38 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-19 15:03:17 +0100 |
commit | 0a9147be6a5e920ea190c9a2bc35fe8e5d772693 (patch) | |
tree | ff08162ba173a8cfd9cb973d0ada77b2b74d6704 /target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch | |
parent | b9e685eed53e1ac98a080ed5d2516949d90467c9 (diff) | |
download | upstream-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/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 8f7d11bd67..a12679db43 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 @@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h -@@ -875,7 +875,7 @@ enum nft_chain_type { +@@ -876,7 +876,7 @@ enum nft_chain_type { * @family: address family * @owner: module owner * @hook_mask: mask of valid hooks @@ -19,7 +19,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> */ struct nf_chain_type { const char *name; -@@ -969,7 +969,6 @@ enum nft_af_flags { +@@ -970,7 +970,6 @@ enum nft_af_flags { * @owner: module owner * @tables: used internally * @flags: family flags @@ -27,7 +27,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> */ struct nft_af_info { struct list_head list; -@@ -978,7 +977,6 @@ struct nft_af_info { +@@ -979,7 +978,6 @@ struct nft_af_info { struct module *owner; struct list_head tables; u32 flags; |