diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-01-07 14:08:03 +0000 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-01-10 00:11:39 +0200 |
commit | 1d2590f83826bb9cdf658001761593519186ce0e (patch) | |
tree | 9c007d2f47fb56b1e766f278fd4cf4f4a597424f /target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch | |
parent | e1b653944d5c11be1cf82f6b0ae25c8ce6516869 (diff) | |
download | mtk-20170518-1d2590f83826bb9cdf658001761593519186ce0e.zip mtk-20170518-1d2590f83826bb9cdf658001761593519186ce0e.tar.gz mtk-20170518-1d2590f83826bb9cdf658001761593519186ce0e.tar.bz2 |
kernel: bump 4.9 to 4.9.75
Refresh patches
Fixes: CVE-2017-5754 aka Meltdown
Tested-on: ar71xx Archer C7 v2
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
[fix conflict after 4.14 bump]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch b/target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch index d2bbb26..20c23ba 100644 --- a/target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch +++ b/target/linux/mvebu/patches-4.9/422-net-mvneta-add-nway_reset-support.patch @@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -3619,6 +3619,13 @@ mvneta_ethtool_get_link_ksettings(struct +@@ -3615,6 +3615,13 @@ mvneta_ethtool_get_link_ksettings(struct return phylink_ethtool_ksettings_get(pp->phylink, cmd); } @@ -25,7 +25,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> /* Set interrupt coalescing for ethtools */ static int mvneta_ethtool_set_coalesce(struct net_device *dev, struct ethtool_coalesce *c) -@@ -3892,6 +3899,7 @@ static const struct net_device_ops mvnet +@@ -3888,6 +3895,7 @@ static const struct net_device_ops mvnet }; const struct ethtool_ops mvneta_eth_tool_ops = { |