kernel: bump 6.6 to 6.6.68

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.68 All patches automatically rebased. Build system: x86/64 Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Signed-off-by: John Audia <[email protected]> Link: openwrt/openwrt#17394 Signed-off-by: Nick Hainke <[email protected]>
lede-project · Dec 30, 2024 · 1aae1df · 1aae1df
1 parent 9ea174c
commit 1aae1df
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/include/kernel-6.6 b/include/kernel-6.6
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .67
-LINUX_KERNEL_HASH-6.6.67 = e41da482ec42a3b0e2b8ed2574c1d327e3dcf95cdf025c55a356b04307113e1a
+LINUX_VERSION-6.6 = .68
+LINUX_KERNEL_HASH-6.6.68 = 283ff410e3f352ceed161ae30c0020301326059db03e86efcb384d46ac5840e2
diff --git a/...inux/generic/backport-6.6/771-v6.7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch b/...inux/generic/backport-6.6/771-v6.7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch
@@ -42,15 +42,15 @@ Signed-off-by: Paolo Abeni <[email protected]>
 
  	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
+@@ -5604,6 +5608,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;
 +	bool pending_packets = false;
  	u32 chan = ch->index;
  	int work_done;
 
-@@ -5611,7 +5616,7 @@ static int stmmac_napi_poll_tx(struct na
+@@ -5612,7 +5617,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 <[email protected]>
  	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
+@@ -5623,6 +5628,10 @@ static int stmmac_napi_poll_tx(struct na
  		spin_unlock_irqrestore(&ch->lock, flags);
  	}
 
@@ -70,15 +70,15 @@ Signed-off-by: Paolo Abeni <[email protected]>
  	return work_done;
  }
 
-@@ -5630,6 +5639,7 @@ static int stmmac_napi_poll_rxtx(struct
+@@ -5631,6 +5640,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;
 +	bool tx_pending_packets = false;
  	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
+@@ -5646,7 +5656,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 <[email protected]>
  	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
+@@ -5671,6 +5681,10 @@ static int stmmac_napi_poll_rxtx(struct
  		spin_unlock_irqrestore(&ch->lock, flags);
  	}
 

diff --git a/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch
@@ -44,7 +44,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
 
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1160,6 +1165,11 @@ static const struct usb_device_id option
+@@ -1162,6 +1167,11 @@ static const struct usb_device_id option
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
  	  .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
@@ -56,7 +56,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  	/* Quectel products using Qualcomm vendor ID */
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
-@@ -1201,6 +1211,11 @@ static const struct usb_device_id option
+@@ -1203,6 +1213,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },

diff --git a/target/linux/generic/hack-6.6/902-debloat_proc.patch b/target/linux/generic/hack-6.6/902-debloat_proc.patch
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!pe)
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
-@@ -4448,6 +4448,8 @@ static const struct seq_operations vmall
+@@ -4450,6 +4450,8 @@ static const struct seq_operations vmall
 
  static int __init proc_vmalloc_init(void)
  {

diff --git a/target/linux/starfive/patches-6.6/1009-net-stmmac-use-GFP_DMA32.patch b/target/linux/starfive/patches-6.6/1009-net-stmmac-use-GFP_DMA32.patch
@@ -19,7 +19,7 @@ Signed-off-by: Matteo Croce <[email protected]>
 
  	if (priv->dma_cap.host_dma_width <= 32)
  		gfp |= GFP_DMA32;
-@@ -4686,7 +4686,7 @@ static inline void stmmac_rx_refill(stru
+@@ -4687,7 +4687,7 @@ static inline void stmmac_rx_refill(stru
  	struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue];
  	int dirty = stmmac_rx_dirty(priv, queue);
  	unsigned int entry = rx_q->dirty_rx;