diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-08-15 19:47:56 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-08-15 22:31:56 +0200 |
commit | e4bad5f0ac9b8e6602181a51b1f97e39bef0595b (patch) | |
tree | ecab994bc521d2ac0f3ed1d31cb1e529de2c3891 /target/linux/mediatek/patches-4.14/0125-phy-phy-mtk-tphy-add-set_mode-callback.patch | |
parent | ae9c3105a3d8db9cd76a05a8e78724e4e1a58853 (diff) | |
download | upstream-e4bad5f0ac9b8e6602181a51b1f97e39bef0595b.tar.gz upstream-e4bad5f0ac9b8e6602181a51b1f97e39bef0595b.tar.bz2 upstream-e4bad5f0ac9b8e6602181a51b1f97e39bef0595b.zip |
kernel: bump kernel 4.14 to version 4.14.63
The following patches were integrated upstream:
* target/linux/ipq40xx/patches-4.14/050-0006-mtd-nand-qcom-Add-a-NULL-check-for-devm_kasprintf.patch
* target/linux/mediatek/patches-4.14/0177-phy-phy-mtk-tphy-use-auto-instead-of-force-to-bypass.patch
This fixes tries to work around the following security problems:
* CVE-2018-3620 L1 Terminal Fault OS, SMM related aspects
* CVE-2018-3646 L1 Terminal Fault Virtualization related aspects
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0125-phy-phy-mtk-tphy-add-set_mode-callback.patch')
-rw-r--r-- | target/linux/mediatek/patches-4.14/0125-phy-phy-mtk-tphy-add-set_mode-callback.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mediatek/patches-4.14/0125-phy-phy-mtk-tphy-add-set_mode-callback.patch b/target/linux/mediatek/patches-4.14/0125-phy-phy-mtk-tphy-add-set_mode-callback.patch index a9481f3d6f..9b651925c9 100644 --- a/target/linux/mediatek/patches-4.14/0125-phy-phy-mtk-tphy-add-set_mode-callback.patch +++ b/target/linux/mediatek/patches-4.14/0125-phy-phy-mtk-tphy-add-set_mode-callback.patch @@ -26,7 +26,7 @@ Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> #define U3P_U3_CHIP_GPIO_CTLD 0x0c #define P3C_REG_IP_SW_RST BIT(31) -@@ -585,6 +587,31 @@ static void u2_phy_instance_exit(struct +@@ -580,6 +582,31 @@ static void u2_phy_instance_exit(struct } } @@ -58,7 +58,7 @@ Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> static void pcie_phy_instance_init(struct mtk_tphy *tphy, struct mtk_phy_instance *instance) { -@@ -881,6 +908,17 @@ static int mtk_phy_exit(struct phy *phy) +@@ -876,6 +903,17 @@ static int mtk_phy_exit(struct phy *phy) return 0; } @@ -76,7 +76,7 @@ Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> static struct phy *mtk_phy_xlate(struct device *dev, struct of_phandle_args *args) { -@@ -931,6 +969,7 @@ static const struct phy_ops mtk_tphy_ops +@@ -926,6 +964,7 @@ static const struct phy_ops mtk_tphy_ops .exit = mtk_phy_exit, .power_on = mtk_phy_power_on, .power_off = mtk_phy_power_off, |