diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-05 11:22:43 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-05 16:00:00 +0100 |
| commit | c764b2b531116d0bf7d285ac8fee29eea6a486cc (patch) | |
| tree | 7ebfe1d3820173b4d11067fd30d5a911011eb73f /target/linux/generic/backport-4.14 | |
| parent | 69734416d23d97c1e58c2cc1fcef535ce0c9ae13 (diff) | |
| download | upstream-c764b2b531116d0bf7d285ac8fee29eea6a486cc.tar.gz upstream-c764b2b531116d0bf7d285ac8fee29eea6a486cc.tar.bz2 upstream-c764b2b531116d0bf7d285ac8fee29eea6a486cc.zip | |
kernel: bump 4.14 to 4.14.79
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14')
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch b/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch index 892b65fbc0..7617c2e5f5 100644 --- a/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch +++ b/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch @@ -115,7 +115,7 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> +#endif --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h -@@ -271,4 +271,22 @@ struct ftrace_likely_data { +@@ -283,4 +283,22 @@ struct ftrace_likely_data { # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long)) #endif diff --git a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch index 809dab3771..fcf54e9858 100644 --- a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch +++ b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch @@ -92,7 +92,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> #endif --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c -@@ -991,7 +991,7 @@ int br_nf_hook_thresh(unsigned int hook, +@@ -992,7 +992,7 @@ int br_nf_hook_thresh(unsigned int hook, unsigned int i; int ret; |