diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-04-24 16:59:36 +0200 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-04-26 08:54:01 +0200 |
| commit | 6cd41b419ca02235b4f0c26ab186f21839a7e2ae (patch) | |
| tree | 3311121cd574d952fa3eac74a786d96f656c13f5 /target | |
| parent | 9aa196e0f260986991dc8ea65a219f81aed0197e (diff) | |
| download | mtk-20170518-6cd41b419ca02235b4f0c26ab186f21839a7e2ae.zip mtk-20170518-6cd41b419ca02235b4f0c26ab186f21839a7e2ae.tar.gz mtk-20170518-6cd41b419ca02235b4f0c26ab186f21839a7e2ae.tar.bz2 | |
kernel: bump 4.14 to 4.14.36
Refreshed all patches.
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Fixes for CVEs:
CVE-2018-1108
CVE-2018-1092
CVE-2018-1094
CVE-2018-1095
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Tested-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target')
5 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch index 8a51eb3..e38dbdb 100644 --- a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch +++ b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch @@ -39,7 +39,7 @@ /** --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -1021,6 +1021,9 @@ static int spi_transfer_one_message(stru +@@ -1027,6 +1027,9 @@ static int spi_transfer_one_message(stru list_for_each_entry(xfer, &msg->transfers, transfer_list) { trace_spi_transfer_start(msg, xfer); diff --git a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 180d140..2a09caf 100644 --- a/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1157,6 +1157,49 @@ static struct mtd_info * __init open_mtd +@@ -1168,6 +1168,49 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> static int __init ubi_init(void) { int err, i, k; -@@ -1240,6 +1283,12 @@ static int __init ubi_init(void) +@@ -1251,6 +1294,12 @@ static int __init ubi_init(void) } } diff --git a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch index 86cb454..8a9da2c 100644 --- a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch +++ b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch @@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1170,6 +1170,9 @@ static void __init ubi_auto_attach(void) +@@ -1181,6 +1181,9 @@ static void __init ubi_auto_attach(void) mtd = open_mtd_device("ubi"); if (IS_ERR(mtd)) mtd = open_mtd_device("data"); diff --git a/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch b/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch index a0fdc14..a443adf 100644 --- a/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch +++ b/target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch @@ -16,7 +16,7 @@ Acked-by: Philipp Zabel <p.zabel@pengutronix.de> --- a/drivers/clk/mediatek/clk-mt2701.c +++ b/drivers/clk/mediatek/clk-mt2701.c -@@ -771,6 +771,8 @@ static void mtk_infrasys_init_early(stru +@@ -772,6 +772,8 @@ static void mtk_infrasys_init_early(stru if (r) pr_err("%s(): could not register clock provider: %d\n", __func__, r); diff --git a/target/linux/mediatek/patches-4.14/0064-dts.patch b/target/linux/mediatek/patches-4.14/0064-dts.patch index 47fc2b1..cfae4fe 100644 --- a/target/linux/mediatek/patches-4.14/0064-dts.patch +++ b/target/linux/mediatek/patches-4.14/0064-dts.patch @@ -11,7 +11,7 @@ cpus { cpu@0 { proc-supply = <&mt6323_vproc_reg>; -@@ -84,6 +88,10 @@ +@@ -102,6 +106,10 @@ memory@80000000 { reg = <0 0x80000000 0 0x40000000>; }; @@ -22,7 +22,7 @@ }; &cir { -@@ -111,11 +119,24 @@ +@@ -129,11 +137,24 @@ }; }; @@ -49,7 +49,7 @@ compatible = "mediatek,mt7530"; #address-cells = <1>; #size-cells = <0>; -@@ -125,6 +146,8 @@ +@@ -143,6 +164,8 @@ core-supply = <&mt6323_vpa_reg>; io-supply = <&mt6323_vemc3v3_reg>; @@ -58,7 +58,7 @@ ports { #address-cells = <1>; #size-cells = <0>; -@@ -133,29 +156,46 @@ +@@ -151,29 +174,46 @@ port@0 { reg = <0>; label = "wan"; @@ -106,7 +106,7 @@ reg = <6>; label = "cpu"; ethernet = <&gmac0>; -@@ -168,8 +208,6 @@ +@@ -186,8 +226,6 @@ }; }; }; |