kernel: bump 5.10 to 5.10.115

Removed upstreamed:
  backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch
  pending-5.10/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit b754b0c721)
This commit is contained in:
John Audia 2022-05-12 13:04:51 -04:00 committed by Tianling Shen
parent b9064e30c5
commit f30ea89a2c
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 12 additions and 12 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .114
LINUX_KERNEL_HASH-5.10.114 = 07d09fb57ce355f4659097e6b538853c00cdded6d3e010b6de9a3244d9b30526
LINUX_VERSION-5.10 = .115
LINUX_KERNEL_HASH-5.10.115 = f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71

View File

@ -137,7 +137,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static int
mt7530_setup(struct dsa_switch *ds)
{
@@ -1675,6 +1779,12 @@ mt7530_setup(struct dsa_switch *ds)
@@ -1676,6 +1780,12 @@ mt7530_setup(struct dsa_switch *ds)
}
}

View File

@ -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
@@ -2371,6 +2371,17 @@ static void mt753x_phylink_mac_link_up(s
@@ -2372,6 +2372,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);
}
@@ -2601,6 +2612,36 @@ mt753x_phy_write(struct dsa_switch *ds,
@@ -2602,6 +2613,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,
@@ -2629,6 +2670,8 @@ static const struct dsa_switch_ops mt753
@@ -2630,6 +2671,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,

View File

@ -1327,7 +1327,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -1202,7 +1202,7 @@ static int sun8i_dwmac_probe(struct plat
@@ -1203,7 +1203,7 @@ static int sun8i_dwmac_probe(struct plat
if (ret)
return -EINVAL;
@ -1478,7 +1478,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (ret)
--- a/drivers/net/ethernet/ti/cpsw_new.c
+++ b/drivers/net/ethernet/ti/cpsw_new.c
@@ -1267,7 +1267,6 @@ static int cpsw_probe_dt(struct cpsw_com
@@ -1269,7 +1269,6 @@ static int cpsw_probe_dt(struct cpsw_com
for_each_child_of_node(tmp_node, port_np) {
struct cpsw_slave_data *slave_data;
@ -1486,7 +1486,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u32 port_id;
ret = of_property_read_u32(port_np, "reg", &port_id);
@@ -1326,10 +1325,8 @@ static int cpsw_probe_dt(struct cpsw_com
@@ -1328,10 +1327,8 @@ static int cpsw_probe_dt(struct cpsw_com
goto err_node_put;
}
@ -1641,7 +1641,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1113,7 +1113,6 @@ static int xemaclite_of_probe(struct pla
@@ -1122,7 +1122,6 @@ static int xemaclite_of_probe(struct pla
struct net_device *ndev = NULL;
struct net_local *lp = NULL;
struct device *dev = &ofdev->dev;
@ -1649,7 +1649,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int rc = 0;
@@ -1155,12 +1154,9 @@ static int xemaclite_of_probe(struct pla
@@ -1164,12 +1163,9 @@ static int xemaclite_of_probe(struct pla
lp->next_rx_buf_to_use = 0x0;
lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong");
lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");

View File

@ -13,7 +13,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -2191,7 +2191,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
@@ -2192,7 +2192,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
static const struct sdhci_ops sdhci_msm_ops = {
.reset = sdhci_msm_reset,