diff --git a/target/linux/generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch
index 85e60a7d4f..63a49702f7 100644
--- a/target/linux/generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch
+++ b/target/linux/generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include "gpiolib.h"
  #include "gpiolib-of.h"
-@@ -1295,3 +1297,73 @@ bool of_gpiochip_instance_match(struct g
+@@ -1302,3 +1304,73 @@ bool of_gpiochip_instance_match(struct g
  
  	return false;
  }
diff --git a/target/linux/generic/kernel-6.18 b/target/linux/generic/kernel-6.18
index 9af1009193..9f634bfa4e 100644
--- a/target/linux/generic/kernel-6.18
+++ b/target/linux/generic/kernel-6.18
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.18 = .29
-LINUX_KERNEL_HASH-6.18.29 = c33ea75b1f3bc5fccab836790cd3684eab7057ff383464b5efd8a68ba622a83c
+LINUX_VERSION-6.18 = .30
+LINUX_KERNEL_HASH-6.18.30 = a8b3886ec3af573f7420b23d27390d4f2b0aac62e8da041662523ce2e7dfb3d4
diff --git a/target/linux/generic/pending-6.18/103-kbuild-export-SUBARCH.patch b/target/linux/generic/pending-6.18/103-kbuild-export-SUBARCH.patch
index bc0b3073ce..8d204b98f6 100644
--- a/target/linux/generic/pending-6.18/103-kbuild-export-SUBARCH.patch
+++ b/target/linux/generic/pending-6.18/103-kbuild-export-SUBARCH.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -626,7 +626,7 @@ export RUSTC_BOOTSTRAP := 1
+@@ -628,7 +628,7 @@ export RUSTC_BOOTSTRAP := 1
  # Allows finding `.clippy.toml` in out-of-srctree builds.
  export CLIPPY_CONF_DIR := $(srctree)
  
diff --git a/target/linux/generic/pending-6.18/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-6.18/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
index f80c127720..80a1f6fedf 100644
--- a/target/linux/generic/pending-6.18/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
+++ b/target/linux/generic/pending-6.18/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
@@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  struct rtnl_link {
  	rtnl_doit_func		doit;
-@@ -5331,7 +5331,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -5332,7 +5332,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
  	    brport_nla_put_flag(skb, flags, mask,
  				IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
  	    brport_nla_put_flag(skb, flags, mask,
diff --git a/target/linux/starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch b/target/linux/starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch
index 69da01cd60..d795521113 100644
--- a/target/linux/starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch
+++ b/target/linux/starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch
@@ -10,7 +10,7 @@ Signed-off-by: Matteo Croce <mcroce@microsoft.com>
 
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -1460,7 +1460,7 @@ static int stmmac_init_rx_buffers(struct
+@@ -1464,7 +1464,7 @@ static int stmmac_init_rx_buffers(struct
  {
  	struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue];
  	struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
@@ -19,7 +19,7 @@ Signed-off-by: Matteo Croce <mcroce@microsoft.com>
  
  	if (priv->dma_cap.host_dma_width <= 32)
  		gfp |= GFP_DMA32;
-@@ -4750,7 +4750,7 @@ static inline void stmmac_rx_refill(stru
+@@ -4754,7 +4754,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;