diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-24 10:58:34 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-24 12:52:52 +0200 |
| commit | 8a26f2a0a1dc9f18479458d0f74acbb847ff1752 (patch) | |
| tree | aaeea2d51ea6cc4d94e28e005e1aaa34bc878b7d | |
| parent | d897b32139a3c2f80b7a7f688dc274327a313aad (diff) | |
| download | upstream-8a26f2a0a1dc9f18479458d0f74acbb847ff1752.tar.gz upstream-8a26f2a0a1dc9f18479458d0f74acbb847ff1752.tar.bz2 upstream-8a26f2a0a1dc9f18479458d0f74acbb847ff1752.zip | |
kernel: bump 4.14 to 4.14.146
Refreshed all patches.
Fixes:
- CVE-2019-14814
- CVE-2019-14815
- CVE-2019-14816
- CVE-2019-14821
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 756cd373e4..83ea51cb61 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .145 +LINUX_VERSION-4.14 = .146 -LINUX_KERNEL_HASH-4.14.145 = eb05b5806713263a6d5bfa1e018ad07c3f4b3c6e71032306a94d7113ed594929 +LINUX_KERNEL_HASH-4.14.146 = a3c54b887ea3e679382bd4c0536e6a281b071dab2258bd3ee8af75baef2023f5 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch index d1e92ae40a..59651c921a 100644 --- a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> EXPORT_SYMBOL(default_qdisc_ops); /* Main transmission queue. */ -@@ -760,7 +760,7 @@ static void attach_one_default_qdisc(str +@@ -764,7 +764,7 @@ static void attach_one_default_qdisc(str void *_unused) { struct Qdisc *qdisc; |