diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-24 11:05:28 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-24 12:52:05 +0200 |
| commit | b6686576b46ee81ca4e42a73a88ee4c1cb0007b3 (patch) | |
| tree | c6d528377a97030bacd5d36ab71db6a3506f4d69 | |
| parent | b1ec16d3c228b85035ba825159c670fafb98af1f (diff) | |
| download | upstream-b6686576b46ee81ca4e42a73a88ee4c1cb0007b3.tar.gz upstream-b6686576b46ee81ca4e42a73a88ee4c1cb0007b3.tar.bz2 upstream-b6686576b46ee81ca4e42a73a88ee4c1cb0007b3.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: cns3xxx
Runtime-tested on: cns3xxx
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 f822c98c5f..c87feab49b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .194 -LINUX_VERSION-4.14 = .145 +LINUX_VERSION-4.14 = .146 LINUX_VERSION-4.19 = .74 LINUX_KERNEL_HASH-4.9.194 = d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3 -LINUX_KERNEL_HASH-4.14.145 = eb05b5806713263a6d5bfa1e018ad07c3f4b3c6e71032306a94d7113ed594929 +LINUX_KERNEL_HASH-4.14.146 = a3c54b887ea3e679382bd4c0536e6a281b071dab2258bd3ee8af75baef2023f5 LINUX_KERNEL_HASH-4.19.74 = 495c2fead329c2c6b17950faa07ad7406e5aa93560e5e58de93a71197579ee82 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(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; |