diff --git a/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch
index c763449594..e01728fc68 100644
--- a/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch
+++ b/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch
@@ -98,7 +98,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  #if defined(CONFIG_NF_CONNTRACK_LABELS)
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -136,6 +136,14 @@ config NF_CONNTRACK_EVENTS
+@@ -135,6 +135,14 @@ config NF_CONNTRACK_EVENTS
  
  	  If unsure, say `N'.
  
diff --git a/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
index bc9eb6e4de..bdd2342913 100644
--- a/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
+++ b/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
@@ -99,7 +99,7 @@
  #ifdef CONFIG_ETHERNET_PACKET_MANGLE
  	if (!dev->eth_mangle_tx ||
  	    (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
-@@ -4753,6 +4761,11 @@ void netdev_rx_handler_unregister(struct
+@@ -4754,6 +4762,11 @@ void netdev_rx_handler_unregister(struct
  }
  EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
  
@@ -111,7 +111,7 @@
  /*
   * Limit the use of PFMEMALLOC reserves to those protocols that implement
   * the special handling of PFMEMALLOC skbs.
-@@ -4803,6 +4816,10 @@ static int __netif_receive_skb_core(stru
+@@ -4804,6 +4817,10 @@ static int __netif_receive_skb_core(stru
  	int ret = NET_RX_DROP;
  	__be16 type;
  
@@ -119,10 +119,10 @@
 +	int (*fast_recv)(struct sk_buff *skb);
 +#endif
 +
- 	net_timestamp_check(!netdev_tstamp_prequeue, skb);
+ 	net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
  
  	trace_netif_receive_skb(skb);
-@@ -4842,6 +4859,16 @@ another_round:
+@@ -4843,6 +4860,16 @@ another_round:
  			goto out;
  	}
  
diff --git a/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch
index 3eec70b649..72af4481c6 100644
--- a/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch
+++ b/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch
@@ -10,7 +10,7 @@
  	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)},	/* Quectel EG95 */
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -390,6 +390,7 @@ static void option_instat_callback(struc
+@@ -391,6 +391,7 @@ static void option_instat_callback(struc
   * Mobidata, etc sell under their own brand names.
   */
  #define LONGCHEER_VENDOR_ID			0x1c9e
@@ -18,7 +18,7 @@
  
  /* 4G Systems products */
  /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick *
-@@ -591,6 +592,16 @@ static void option_instat_callback(struc
+@@ -598,6 +599,16 @@ static void option_instat_callback(struc
  /* Device needs ZLP */
  #define ZLP		BIT(17)
  
@@ -35,7 +35,7 @@
  
  static const struct usb_device_id option_ids[] = {
  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
-@@ -625,6 +636,8 @@ static const struct usb_device_id option
+@@ -632,6 +643,8 @@ static const struct usb_device_id option
  	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
  	{ USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
  	  .driver_info = RSVD(4) },