kernel: bump 5.15 to 5.15.151 (#11958)

coolsnowwolf · Mar 8, 2024 · 2923d86 · 2923d86
1 parent 8c403ec
commit 2923d86
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 73 deletions.
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .150
-LINUX_KERNEL_HASH-5.15.150 = ee05592b458e7fcdc515b43605883a10cc2f65f2e2b58d60af8a72b93467e4d4
+LINUX_VERSION-5.15 = .151
+LINUX_KERNEL_HASH-5.15.151 = 8a1e760bf2660947234109aa4fdbbe3686238b4e852157b96c59356689107e49
diff --git a/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch b/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch
@@ -15,7 +15,7 @@ Date:   Fri Mar 11 10:14:20 2022 +0100
 
 --- a/drivers/net/veth.c
 +++ b/drivers/net/veth.c
-@@ -1473,9 +1473,14 @@ static int veth_xdp_set(struct net_devic
+@@ -1457,9 +1457,14 @@ static int veth_xdp_set(struct net_devic
  			goto err;
  		}
 

diff --git a/...eric/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch b/...eric/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
@@ -71,23 +71,23 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	ret = stmmac_hw_setup(dev, true);
  	if (ret < 0) {
  		netdev_err(priv->dev, "%s: Hw setup failed\n", __func__);
-@@ -6410,6 +6403,7 @@ void stmmac_enable_rx_queue(struct stmma
+@@ -6412,6 +6405,7 @@ void stmmac_enable_rx_queue(struct stmma
  		return;
  	}
 
 +	stmmac_reset_rx_queue(priv, queue);
  	stmmac_clear_rx_descriptors(priv, queue);
 
  	stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
-@@ -6471,6 +6465,7 @@ void stmmac_enable_tx_queue(struct stmma
+@@ -6473,6 +6467,7 @@ void stmmac_enable_tx_queue(struct stmma
  		return;
  	}
 
 +	stmmac_reset_tx_queue(priv, queue);
  	stmmac_clear_tx_descriptors(priv, queue);
 
  	stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
-@@ -7398,6 +7393,25 @@ int stmmac_suspend(struct device *dev)
+@@ -7400,6 +7395,25 @@ int stmmac_suspend(struct device *dev)
  }
  EXPORT_SYMBOL_GPL(stmmac_suspend);
 
@@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  /**
   * stmmac_reset_queues_param - reset queue parameters
   * @priv: device pointer
-@@ -7408,22 +7422,11 @@ static void stmmac_reset_queues_param(st
+@@ -7410,22 +7424,11 @@ static void stmmac_reset_queues_param(st
  	u32 tx_cnt = priv->plat->tx_queues_to_use;
  	u32 queue;
 

diff --git a/...eric/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch b/...eric/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
@@ -17,7 +17,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -3835,8 +3835,6 @@ static int stmmac_release(struct net_dev
+@@ -3837,8 +3837,6 @@ static int stmmac_release(struct net_dev
  	struct stmmac_priv *priv = netdev_priv(dev);
  	u32 chan;
 
@@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	if (device_may_wakeup(priv->device))
  		phylink_speed_down(priv->phylink, false);
  	/* Stop and disconnect the PHY */
-@@ -3848,6 +3846,8 @@ static int stmmac_release(struct net_dev
+@@ -3850,6 +3848,8 @@ static int stmmac_release(struct net_dev
  	for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
  		hrtimer_cancel(&priv->tx_queue[chan].txtimer);