aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-09-10 23:37:48 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2017-09-11 01:56:14 +0200
commitd5b7215e3144c32893e7bc44056bac1e217dd9f3 (patch)
treecfb178a60628f6c2bd331e6e7fbedf7e1d7955a1 /target/linux/mediatek
parentc11762e435e13a7fbefb0406acad75b87c18312b (diff)
downloadupstream-d5b7215e3144c32893e7bc44056bac1e217dd9f3.tar.gz
upstream-d5b7215e3144c32893e7bc44056bac1e217dd9f3.tar.bz2
upstream-d5b7215e3144c32893e7bc44056bac1e217dd9f3.zip
kernel: update 4.9 to 4.9.49
Refresh patches. Compile-tested on octeon and x86/64. Runtime-tested on octeon and x86/64. Fixes CVE-2017-11600. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mediatek')
-rw-r--r--target/linux/mediatek/patches-4.9/0062-mdio-atomic.patch6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/mediatek/patches-4.9/0062-mdio-atomic.patch b/target/linux/mediatek/patches-4.9/0062-mdio-atomic.patch
index 040084d781..96e7072a33 100644
--- a/target/linux/mediatek/patches-4.9/0062-mdio-atomic.patch
+++ b/target/linux/mediatek/patches-4.9/0062-mdio-atomic.patch
@@ -1,7 +1,5 @@
-Index: linux-4.9.47/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-===================================================================
---- linux-4.9.47.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ linux-4.9.47/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -97,7 +97,10 @@ static int mtk_mdio_busy_wait(struct mtk
return 0;
if (time_after(jiffies, t_start + PHY_IAC_TIMEOUT))