[openwrt/openwrt] kernel: bump 6.12 to 6.12.54
LEDE Commits
lede-commits at lists.infradead.org
Wed Oct 22 14:37:52 PDT 2025
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/855f65d6d0505457dc6342862e7913e04e076abd
commit 855f65d6d0505457dc6342862e7913e04e076abd
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Sun Oct 19 15:49:48 2025 -0400
kernel: bump 6.12 to 6.12.54
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.54
Manually rebased:
bcm27xx/patches-6.12/950-0018-arm64-setup-Fix-build-warning.patch
All other patches automatically rebased.
Build system: x86/64
Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64-glibc
Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64-glibc
Build system: x86/64
Build-tested: x86/64-glibc
Run-tested: x86/64-glibc
Signed-off-by: John Audia <therealgraysky at proton.me>
Build system: x86/64
Build-tested: mediatek/filogic
Run-tested: mediatek/filogic
Signed-off-by: Edoardo Pinci <epinci at outlook.com>
Link: https://github.com/openwrt/openwrt/pull/20408
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
.../bcm27xx/patches-6.12/950-0018-arm64-setup-Fix-build-warning.patch | 2 +-
...950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch | 4 ++--
.../610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch | 4 ++--
target/linux/generic/kernel-6.12 | 4 ++--
.../812-PCI-sysfs-enforce-single-creation-of-sysfs-entry-for.patch | 4 ++--
target/linux/generic/pending-6.12/920-mangle_bootargs.patch | 4 ++--
.../902-ARM-decompressor-support-for-ATAGs-rootblock-parsing.patch | 2 +-
.../patches-6.12/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/target/linux/bcm27xx/patches-6.12/950-0018-arm64-setup-Fix-build-warning.patch b/target/linux/bcm27xx/patches-6.12/950-0018-arm64-setup-Fix-build-warning.patch
index 0867cda6de..cca6e76064 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0018-arm64-setup-Fix-build-warning.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0018-arm64-setup-Fix-build-warning.patch
@@ -13,7 +13,7 @@ Signed-off-by: Maxime Ripard <maxime at cerno.tech>
@@ -214,9 +214,9 @@ static void __init request_standard_reso
size_t res_size;
- kernel_code.start = __pa_symbol(_stext);
+ kernel_code.start = __pa_symbol(_text);
- kernel_code.end = __pa_symbol(__init_begin - 1);
+ kernel_code.end = __pa_symbol(__init_begin) - 1;
kernel_data.start = __pa_symbol(_sdata);
diff --git a/target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch b/target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch
index 0e31e290e7..7ad80a032c 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch
@@ -88,7 +88,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco at xs4all.nl>
/* Called when the last user of the media device exits. */
static void media_devnode_release(struct device *cd)
{
-@@ -236,6 +239,7 @@ int __must_check media_devnode_register(
+@@ -231,6 +234,7 @@ int __must_check media_devnode_register(
if (devnode->parent)
devnode->dev.parent = devnode->parent;
dev_set_name(&devnode->dev, "media%d", devnode->minor);
@@ -96,7 +96,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco at xs4all.nl>
device_initialize(&devnode->dev);
/* Part 2: Initialize the character device */
-@@ -313,6 +317,7 @@ static int __init media_devnode_init(voi
+@@ -309,6 +313,7 @@ static int __init media_devnode_init(voi
static void __exit media_devnode_exit(void)
{
diff --git a/target/linux/generic/hack-6.12/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch b/target/linux/generic/hack-6.12/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch
index 8717f51b9d..82a23e6e44 100644
--- a/target/linux/generic/hack-6.12/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch
+++ b/target/linux/generic/hack-6.12/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch
@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
-@@ -1123,8 +1123,9 @@ static void page_pool_release_retry(stru
+@@ -1153,8 +1153,9 @@ static void page_pool_release_retry(stru
{
struct delayed_work *dwq = to_delayed_work(wq);
struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw);
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
inflight = page_pool_release(pool);
/* In rare cases, a driver bug may cause inflight to go negative.
-@@ -1136,6 +1137,21 @@ static void page_pool_release_retry(stru
+@@ -1166,6 +1167,21 @@ static void page_pool_release_retry(stru
if (inflight <= 0)
return;
diff --git a/target/linux/generic/kernel-6.12 b/target/linux/generic/kernel-6.12
index 025f59067d..1b89660b42 100644
--- a/target/linux/generic/kernel-6.12
+++ b/target/linux/generic/kernel-6.12
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .53
-LINUX_KERNEL_HASH-6.12.53 = 663507accae673afcf4e210b4ae8d4352e61d926202e5da3f04bf71ca1d2c0b5
+LINUX_VERSION-6.12 = .54
+LINUX_KERNEL_HASH-6.12.54 = 1b0dcd3390efeec44e528748609bafcf36eae895bb68c8f62ac5e5940943de62
diff --git a/target/linux/generic/pending-6.12/812-PCI-sysfs-enforce-single-creation-of-sysfs-entry-for.patch b/target/linux/generic/pending-6.12/812-PCI-sysfs-enforce-single-creation-of-sysfs-entry-for.patch
index edb15e9d0a..e5f54d7214 100644
--- a/target/linux/generic/pending-6.12/812-PCI-sysfs-enforce-single-creation-of-sysfs-entry-for.patch
+++ b/target/linux/generic/pending-6.12/812-PCI-sysfs-enforce-single-creation-of-sysfs-entry-for.patch
@@ -68,7 +68,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
/* show configuration fields */
#define pci_config_attr(field, format_string) \
-@@ -1533,12 +1535,32 @@ static const struct attribute_group pci_
+@@ -1551,12 +1553,32 @@ static const struct attribute_group pci_
.is_visible = resource_resize_is_visible,
};
@@ -102,7 +102,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
}
/**
-@@ -1559,21 +1581,23 @@ static int __init pci_sysfs_init(void)
+@@ -1577,21 +1599,23 @@ static int __init pci_sysfs_init(void)
{
struct pci_dev *pdev = NULL;
struct pci_bus *pbus = NULL;
diff --git a/target/linux/generic/pending-6.12/920-mangle_bootargs.patch b/target/linux/generic/pending-6.12/920-mangle_bootargs.patch
index d3b92ba65c..3bf2fce4fb 100644
--- a/target/linux/generic/pending-6.12/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-6.12/920-mangle_bootargs.patch
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
help
--- a/init/main.c
+++ b/init/main.c
-@@ -621,6 +621,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -633,6 +633,29 @@ static inline void setup_nr_cpu_ids(void
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
/*
* We need to store the untouched command line for future reference.
* We also need to store the touched command line since the parameter
-@@ -927,6 +950,7 @@ void start_kernel(void)
+@@ -939,6 +962,7 @@ void start_kernel(void)
jump_label_init();
static_call_init();
early_security_init();
diff --git a/target/linux/ipq806x/patches-6.12/902-ARM-decompressor-support-for-ATAGs-rootblock-parsing.patch b/target/linux/ipq806x/patches-6.12/902-ARM-decompressor-support-for-ATAGs-rootblock-parsing.patch
index f12f88414d..f2fb62baa1 100644
--- a/target/linux/ipq806x/patches-6.12/902-ARM-decompressor-support-for-ATAGs-rootblock-parsing.patch
+++ b/target/linux/ipq806x/patches-6.12/902-ARM-decompressor-support-for-ATAGs-rootblock-parsing.patch
@@ -177,7 +177,7 @@ Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
#include <linux/percpu.h>
#include <linux/kmod.h>
#include <linux/kprobes.h>
-@@ -961,6 +962,17 @@ void start_kernel(void)
+@@ -973,6 +974,17 @@ void start_kernel(void)
pr_notice("Kernel command line: %s\n", saved_command_line);
/* parameters may set static keys */
diff --git a/target/linux/mvebu/patches-6.12/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-6.12/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
index 2d01b48f69..b0a9a31232 100644
--- a/target/linux/mvebu/patches-6.12/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
+++ b/target/linux/mvebu/patches-6.12/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
@@ -258,7 +258,7 @@ Signed-off-by: Michael Gray <michael.gray at lantisproject.com>
static int kernel_init(void *);
/*
-@@ -960,6 +964,18 @@ void start_kernel(void)
+@@ -972,6 +976,18 @@ void start_kernel(void)
boot_cpu_hotplug_init();
pr_notice("Kernel command line: %s\n", saved_command_line);
More information about the lede-commits
mailing list