[openwrt/openwrt] kernel: bump 6.6 to 6.6.21

LEDE Commits lede-commits at lists.infradead.org
Sun Mar 17 13:16:57 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/6642d6c24e6b4e63ad4fc25a0582a04ff06b8b2c

commit 6642d6c24e6b4e63ad4fc25a0582a04ff06b8b2c
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Sat Mar 16 06:48:39 2024 -0400

    kernel: bump 6.6 to 6.6.21
    
    Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.21
    
    All patches automatically rebased.
    
    Signed-off-by: John Audia <therealgraysky at proton.me>
---
 include/kernel-6.6                                           |  4 ++--
 ....7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/kernel-6.6 b/include/kernel-6.6
index 53132d2ae5..f4fb9269c2 100644
--- a/include/kernel-6.6
+++ b/include/kernel-6.6
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .20
-LINUX_KERNEL_HASH-6.6.20 = e2f6c7f39b304248193370f8c5755553ab73ad5672e92dae994a344084d8dd22
+LINUX_VERSION-6.6 = .21
+LINUX_KERNEL_HASH-6.6.21 = ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457
diff --git a/target/linux/generic/backport-6.6/771-v6.7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch b/target/linux/generic/backport-6.6/771-v6.7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch
index c02e7f8888..ce39895b45 100644
--- a/target/linux/generic/backport-6.6/771-v6.7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch
+++ b/target/linux/generic/backport-6.6/771-v6.7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch
@@ -42,7 +42,7 @@ Signed-off-by: Paolo Abeni <pabeni at redhat.com>
  
  	u64_stats_update_begin(&txq_stats->napi_syncp);
  	u64_stats_add(&txq_stats->napi.tx_packets, tx_packets);
-@@ -5603,6 +5607,7 @@ static int stmmac_napi_poll_tx(struct na
+@@ -5605,6 +5609,7 @@ static int stmmac_napi_poll_tx(struct na
  		container_of(napi, struct stmmac_channel, tx_napi);
  	struct stmmac_priv *priv = ch->priv_data;
  	struct stmmac_txq_stats *txq_stats;
@@ -50,7 +50,7 @@ Signed-off-by: Paolo Abeni <pabeni at redhat.com>
  	u32 chan = ch->index;
  	int work_done;
  
-@@ -5611,7 +5616,7 @@ static int stmmac_napi_poll_tx(struct na
+@@ -5613,7 +5618,7 @@ static int stmmac_napi_poll_tx(struct na
  	u64_stats_inc(&txq_stats->napi.poll);
  	u64_stats_update_end(&txq_stats->napi_syncp);
  
@@ -59,7 +59,7 @@ Signed-off-by: Paolo Abeni <pabeni at redhat.com>
  	work_done = min(work_done, budget);
  
  	if (work_done < budget && napi_complete_done(napi, work_done)) {
-@@ -5622,6 +5627,10 @@ static int stmmac_napi_poll_tx(struct na
+@@ -5624,6 +5629,10 @@ static int stmmac_napi_poll_tx(struct na
  		spin_unlock_irqrestore(&ch->lock, flags);
  	}
  
@@ -70,7 +70,7 @@ Signed-off-by: Paolo Abeni <pabeni at redhat.com>
  	return work_done;
  }
  
-@@ -5630,6 +5639,7 @@ static int stmmac_napi_poll_rxtx(struct
+@@ -5632,6 +5641,7 @@ static int stmmac_napi_poll_rxtx(struct
  	struct stmmac_channel *ch =
  		container_of(napi, struct stmmac_channel, rxtx_napi);
  	struct stmmac_priv *priv = ch->priv_data;
@@ -78,7 +78,7 @@ Signed-off-by: Paolo Abeni <pabeni at redhat.com>
  	int rx_done, tx_done, rxtx_done;
  	struct stmmac_rxq_stats *rxq_stats;
  	struct stmmac_txq_stats *txq_stats;
-@@ -5645,7 +5655,7 @@ static int stmmac_napi_poll_rxtx(struct
+@@ -5647,7 +5657,7 @@ static int stmmac_napi_poll_rxtx(struct
  	u64_stats_inc(&txq_stats->napi.poll);
  	u64_stats_update_end(&txq_stats->napi_syncp);
  
@@ -87,7 +87,7 @@ Signed-off-by: Paolo Abeni <pabeni at redhat.com>
  	tx_done = min(tx_done, budget);
  
  	rx_done = stmmac_rx_zc(priv, budget, chan);
-@@ -5670,6 +5680,10 @@ static int stmmac_napi_poll_rxtx(struct
+@@ -5672,6 +5682,10 @@ static int stmmac_napi_poll_rxtx(struct
  		spin_unlock_irqrestore(&ch->lock, flags);
  	}
  




More information about the lede-commits mailing list