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/linux/mediatek | |
| parent | 9aa196e0f260986991dc8ea65a219f81aed0197e (diff) | |
| download | upstream-6cd41b419ca02235b4f0c26ab186f21839a7e2ae.tar.gz upstream-6cd41b419ca02235b4f0c26ab186f21839a7e2ae.tar.bz2 upstream-6cd41b419ca02235b4f0c26ab186f21839a7e2ae.zip | |
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/linux/mediatek')
| -rw-r--r-- | target/linux/mediatek/patches-4.14/0006-reset-mediatek-mt2701-reset-driver.patch | 2 | ||||
| -rw-r--r-- | target/linux/mediatek/patches-4.14/0064-dts.patch | 10 |
2 files changed, 6 insertions, 6 deletions
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 a0fdc14f78..a443adfe64 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 47fc2b1b23..cfae4fee64 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 @@ }; }; }; |