From 94cf851909cb9c13557cf7d8fb5f03a3fe2b5558 Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 14 May 2026 10:56:11 -0400 Subject: [PATCH] kernel: bump 6.18 to 6.18.30 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.30 All other patches automatically rebased via update_kernel.sh Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/23306 Signed-off-by: Hauke Mehrtens --- .../generic/hack-6.18/800-GPIO-add-named-gpio-exports.patch | 2 +- target/linux/generic/kernel-6.18 | 4 ++-- .../generic/pending-6.18/103-kbuild-export-SUBARCH.patch | 2 +- .../710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch | 2 +- .../starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) 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 #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 --- 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 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 --- 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 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;