diff --git a/target/linux/generic/hack-6.18/204-module_strip.patch b/target/linux/generic/hack-6.18/204-module_strip.patch
index 3e33bddbf6..11173a2095 100644
--- a/target/linux/generic/hack-6.18/204-module_strip.patch
+++ b/target/linux/generic/hack-6.18/204-module_strip.patch
@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  /* Parse tag=value strings from .modinfo section */
  char *module_next_tag_pair(char *string, unsigned long *secsize)
-@@ -2572,9 +2574,11 @@ static void module_augment_kernel_taints
+@@ -2579,9 +2581,11 @@ static void module_augment_kernel_taints
  
  static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  {
@@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (flags & MODULE_INIT_IGNORE_VERMAGIC)
  		modmagic = NULL;
  
-@@ -2588,6 +2592,7 @@ static int check_modinfo(struct module *
+@@ -2595,6 +2599,7 @@ static int check_modinfo(struct module *
  		       info->name, modmagic, vermagic);
  		return -ENOEXEC;
  	}
diff --git a/target/linux/generic/hack-6.18/259-regmap_dynamic.patch b/target/linux/generic/hack-6.18/259-regmap_dynamic.patch
index 69dd8cbd44..1486b35650 100644
--- a/target/linux/generic/hack-6.18/259-regmap_dynamic.patch
+++ b/target/linux/generic/hack-6.18/259-regmap_dynamic.patch
@@ -139,7 +139,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #include <linux/mutex.h>
  #include <linux/err.h>
  #include <linux/property.h>
-@@ -3525,3 +3526,5 @@ static int __init regmap_initcall(void)
+@@ -3547,3 +3548,5 @@ static int __init regmap_initcall(void)
  	return 0;
  }
  postcore_initcall(regmap_initcall);
diff --git a/target/linux/generic/kernel-6.18 b/target/linux/generic/kernel-6.18
index 5cd89cd490..67a4c93f22 100644
--- a/target/linux/generic/kernel-6.18
+++ b/target/linux/generic/kernel-6.18
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.18 = .20
-LINUX_KERNEL_HASH-6.18.20 = 837a5abd98e46078a0ae1400e2daad89ece45cc3209037b09c2265dab2393553
+LINUX_VERSION-6.18 = .21
+LINUX_KERNEL_HASH-6.18.21 = 1c38214fb137bae85b82b82537b5987358621b915ab2a8e4f09e60697c19474f
diff --git a/target/linux/generic/pending-6.18/630-packet_socket_type.patch b/target/linux/generic/pending-6.18/630-packet_socket_type.patch
index 36961fc0da..c896893ef8 100644
--- a/target/linux/generic/pending-6.18/630-packet_socket_type.patch
+++ b/target/linux/generic/pending-6.18/630-packet_socket_type.patch
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (!net_eq(dev_net(dev), sock_net(sk)))
  		goto drop;
  
-@@ -3375,6 +3377,7 @@ static int packet_create(struct net *net
+@@ -3376,6 +3378,7 @@ static int packet_create(struct net *net
  	mutex_init(&po->pg_vec_lock);
  	po->rollover = NULL;
  	po->prot_hook.func = packet_rcv;
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -4043,6 +4046,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -4044,6 +4047,16 @@ packet_setsockopt(struct socket *sock, i
  		packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val);
  		return 0;
  	}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -4105,6 +4118,13 @@ static int packet_getsockopt(struct sock
+@@ -4106,6 +4119,13 @@ static int packet_getsockopt(struct sock
  	case PACKET_COPY_THRESH:
  		val = READ_ONCE(pkt_sk(sk)->copy_thresh);
  		break;
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 318cbe6262..d4e5c4bce8 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;
-@@ -5295,7 +5295,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -5317,7 +5317,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,