diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-08-19 00:19:24 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-08-21 15:59:39 +0200 |
commit | 8408e0ff07003f1fd93c3bec47bb142eb06ace69 (patch) | |
tree | 00866f9e8b208eabcfb7f76e9714081d5dfce612 /target/linux/generic | |
parent | beddcfdc30e734df52c588ef4862de45b1af7235 (diff) | |
download | upstream-8408e0ff07003f1fd93c3bec47bb142eb06ace69.tar.gz upstream-8408e0ff07003f1fd93c3bec47bb142eb06ace69.tar.bz2 upstream-8408e0ff07003f1fd93c3bec47bb142eb06ace69.zip |
kernel: bump 5.10 to 5.10.60
No deleted or manually refreshed patches.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic')
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/backport-5.10/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch b/target/linux/generic/backport-5.10/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch index 951ae9c664..f3a6f948ad 100644 --- a/target/linux/generic/backport-5.10/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch +++ b/target/linux/generic/backport-5.10/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -435,34 +435,32 @@ mt7530_pad_clk_setup(struct dsa_switch * +@@ -436,34 +436,32 @@ mt7530_pad_clk_setup(struct dsa_switch * TD_DM_DRVP(8) | TD_DM_DRVN(8)); /* Setup core clock for MT7530 */ diff --git a/target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch b/target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch index 28576bbfd6..bba3136692 100644 --- a/target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch +++ b/target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -2269,6 +2269,17 @@ static void mt753x_phylink_mac_link_up(s +@@ -2270,6 +2270,17 @@ static void mt753x_phylink_mac_link_up(s mcr |= PMCR_RX_FC_EN; } @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mt7530_set(priv, MT7530_PMCR_P(port), mcr); } -@@ -2499,6 +2510,36 @@ mt753x_phy_write(struct dsa_switch *ds, +@@ -2500,6 +2511,36 @@ mt753x_phy_write(struct dsa_switch *ds, return priv->info->phy_write(ds, port, regnum, val); } @@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static const struct dsa_switch_ops mt7530_switch_ops = { .get_tag_protocol = mtk_get_tag_protocol, .setup = mt753x_setup, -@@ -2527,6 +2568,8 @@ static const struct dsa_switch_ops mt753 +@@ -2528,6 +2569,8 @@ static const struct dsa_switch_ops mt753 .phylink_mac_an_restart = mt753x_phylink_mac_an_restart, .phylink_mac_link_down = mt753x_phylink_mac_link_down, .phylink_mac_link_up = mt753x_phylink_mac_link_up, diff --git a/target/linux/generic/hack-5.10/221-module_exports.patch b/target/linux/generic/hack-5.10/221-module_exports.patch index 2fcb2d9809..cd38125f28 100644 --- a/target/linux/generic/hack-5.10/221-module_exports.patch +++ b/target/linux/generic/hack-5.10/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } \ \ /* __*init sections */ \ -@@ -1018,6 +1028,8 @@ +@@ -1019,6 +1029,8 @@ #define COMMON_DISCARDS \ SANITIZER_DISCARDS \ |