From 7a0af40e3746eb847aec1812294d2bd0b8c75f77 Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 12 May 2022 13:04:51 -0400 Subject: 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 (cherry picked from commit b754b0c721131005efa7127151088e9c23dc9053) --- ...xt-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch') diff --git a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index bc7b2b3b10..a4a9f5624e 100644 --- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -1327,7 +1327,7 @@ Signed-off-by: David S. Miller --- 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 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 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 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 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"); -- cgit v1.2.3