kernel: bump 6.18 to 6.18.27

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.27

Manually rebased:
  pending-6.18/151-net-bridge-do-not-send-arp-replies-if-src-and-target.patch

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 <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/23252
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
John Audia
2026-05-07 07:31:59 -04:00
committed by Hauke Mehrtens
parent 7a94273e55
commit 4c942c06b8
10 changed files with 16 additions and 16 deletions
@@ -312,7 +312,7 @@ SVN-Revision: 35130
case IPV6_2292HOPOPTS: case IPV6_2292HOPOPTS:
--- a/net/ipv6/exthdrs.c --- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c
@@ -988,7 +988,7 @@ static bool ipv6_hop_jumbo(struct sk_buf @@ -991,7 +991,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
goto drop; goto drop;
} }
@@ -15,7 +15,7 @@ Signed-off-by: Yury Norov (NVIDIA) <yury.norov@gmail.com>
--- a/sound/usb/mixer_quirks.c --- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c
@@ -3306,10 +3306,6 @@ static int snd_bbfpro_controls_create(st @@ -3308,10 +3308,6 @@ static int snd_bbfpro_controls_create(st
#define RME_DIGIFACE_REGISTER(reg, mask) (((reg) << 16) | (mask)) #define RME_DIGIFACE_REGISTER(reg, mask) (((reg) << 16) | (mask))
#define RME_DIGIFACE_INVERT BIT(31) #define RME_DIGIFACE_INVERT BIT(31)
@@ -117,7 +117,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mmc/core/block.c --- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c
@@ -2642,6 +2642,10 @@ static struct mmc_blk_data *mmc_blk_allo @@ -2650,6 +2650,10 @@ static struct mmc_blk_data *mmc_blk_allo
if (area_type == MMC_BLK_DATA_AREA_MAIN) if (area_type == MMC_BLK_DATA_AREA_MAIN)
dev_set_drvdata(&card->dev, md); dev_set_drvdata(&card->dev, md);
disk_fwnode = mmc_blk_get_partitions_node(parent, subname); disk_fwnode = mmc_blk_get_partitions_node(parent, subname);
+2 -2
View File
@@ -1,2 +1,2 @@
LINUX_VERSION-6.18 = .26 LINUX_VERSION-6.18 = .27
LINUX_KERNEL_HASH-6.18.26 = 53772f5d3776e043767c8d81a32240d1f3eb64e822a5d7a510b55ca40707b0ec LINUX_KERNEL_HASH-6.18.27 = 25017b93946f0ba2cbf71910b59640a29d9167a5b65ccd41b12cd991875ce2ea
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -625,7 +625,7 @@ export RUSTC_BOOTSTRAP := 1 @@ -626,7 +626,7 @@ export RUSTC_BOOTSTRAP := 1
# Allows finding `.clippy.toml` in out-of-srctree builds. # Allows finding `.clippy.toml` in out-of-srctree builds.
export CLIPPY_CONF_DIR := $(srctree) export CLIPPY_CONF_DIR := $(srctree)
@@ -15,10 +15,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/bridge/br_arp_nd_proxy.c --- a/net/bridge/br_arp_nd_proxy.c
+++ b/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c
@@ -207,7 +207,10 @@ void br_do_proxy_suppress_arp(struct sk_ @@ -208,7 +208,10 @@ void br_do_proxy_suppress_arp(struct sk_
if ((p && (p->flags & BR_PROXYARP)) || if ((p && (p->flags & BR_PROXYARP)) ||
(f->dst && (f->dst->flags & BR_PROXYARP_WIFI)) || (dst && (dst->flags & BR_PROXYARP_WIFI)) ||
br_is_neigh_suppress_enabled(f->dst, vid)) { br_is_neigh_suppress_enabled(dst, vid)) {
- if (!vid) - if (!vid)
+ replied = true; + replied = true;
+ if (!memcmp(n->ha, sha, dev->addr_len)) + if (!memcmp(n->ha, sha, dev->addr_len))
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
br_arp_send(br, p, skb->dev, sip, tip, br_arp_send(br, p, skb->dev, sip, tip,
sha, n->ha, sha, 0, 0); sha, n->ha, sha, 0, 0);
else else
@@ -215,7 +218,6 @@ void br_do_proxy_suppress_arp(struct sk_ @@ -216,7 +219,6 @@ void br_do_proxy_suppress_arp(struct sk_
sha, n->ha, sha, sha, n->ha, sha,
skb->vlan_proto, skb->vlan_proto,
skb_vlan_tag_get(skb)); skb_vlan_tag_get(skb));
@@ -26,7 +26,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -126,7 +126,7 @@ @@ -127,7 +127,7 @@
/* /*
* Minimum number of threads to boot the kernel * Minimum number of threads to boot the kernel
*/ */
@@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mmc/core/block.c --- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c
@@ -2607,6 +2607,7 @@ static struct mmc_blk_data *mmc_blk_allo @@ -2615,6 +2615,7 @@ static struct mmc_blk_data *mmc_blk_allo
md->disk->major = MMC_BLOCK_MAJOR; md->disk->major = MMC_BLOCK_MAJOR;
md->disk->minors = perdev_minors; md->disk->minors = perdev_minors;
md->disk->first_minor = devidx * perdev_minors; md->disk->first_minor = devidx * perdev_minors;
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
/* /*
* We need to store the untouched command line for future reference. * We need to store the untouched command line for future reference.
* We also need to store the touched command line since the parameter * We also need to store the touched command line since the parameter
@@ -934,6 +957,7 @@ void start_kernel(void) @@ -933,6 +956,7 @@ void start_kernel(void)
jump_label_init(); jump_label_init();
static_call_init(); static_call_init();
early_security_init(); early_security_init();
@@ -11,7 +11,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
--- a/drivers/spi/spi.c --- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c +++ b/drivers/spi/spi.c
@@ -1476,6 +1476,70 @@ static int spi_transfer_wait(struct spi_ @@ -1478,6 +1478,70 @@ static int spi_transfer_wait(struct spi_
return 0; return 0;
} }
@@ -82,7 +82,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
static void _spi_transfer_delay_ns(u32 ns) static void _spi_transfer_delay_ns(u32 ns)
{ {
if (!ns) if (!ns)
@@ -2330,6 +2394,75 @@ void spi_flush_queue(struct spi_controll @@ -2332,6 +2396,75 @@ void spi_flush_queue(struct spi_controll
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
@@ -158,7 +158,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
static void of_spi_parse_dt_cs_delay(struct device_node *nc, static void of_spi_parse_dt_cs_delay(struct device_node *nc,
struct spi_delay *delay, const char *prop) struct spi_delay *delay, const char *prop)
{ {
@@ -2485,6 +2618,10 @@ of_register_spi_device(struct spi_contro @@ -2487,6 +2620,10 @@ of_register_spi_device(struct spi_contro
if (rc) if (rc)
goto err_out; goto err_out;