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/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.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/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch index 2af2fbe284..77e4db3ed7 100644 --- a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch +++ b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch @@ -236,7 +236,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> .owner = THIS_MODULE, --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5063,40 +5063,38 @@ static int nf_tables_newflowtable(struct +@@ -5064,40 +5064,38 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -285,7 +285,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> err3: module_put(type->owner); err2: -@@ -5377,10 +5375,8 @@ err: +@@ -5378,10 +5376,8 @@ err: static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable) { |