openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-04-23 17:58:43 +04:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 6.12 to 6.12.54

Browse Source 
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@proton.me>

Build system: x86/64
Build-tested: mediatek/filogic
Run-tested: mediatek/filogic

Signed-off-by: Edoardo Pinci <epinci@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/20408
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
John Audia
2025-10-19 15:49:48 -04:00
committed by Hauke Mehrtens
parent d0e3320040
commit 855f65d6d0
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/bcm27xx/patches-6.12/950-0018-arm64-setup-Fix-build-warning.patch
View File

@@ -13,7 +13,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
@@ -214,9 +214,9 @@ static void __init request_standard_reso @@ -214,9 +214,9 @@ static void __init request_standard_reso
size_t res_size; 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_code.end = __pa_symbol(__init_begin) - 1; + kernel_code.end = __pa_symbol(__init_begin) - 1;
kernel_data.start = __pa_symbol(_sdata); kernel_data.start = __pa_symbol(_sdata);

4
target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch
View File

@@ -88,7 +88,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
/* Called when the last user of the media device exits. */ /* Called when the last user of the media device exits. */
static void media_devnode_release(struct device *cd) 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) if (devnode->parent)
devnode->dev.parent = devnode->parent; devnode->dev.parent = devnode->parent;
dev_set_name(&devnode->dev, "media%d", devnode->minor); dev_set_name(&devnode->dev, "media%d", devnode->minor);
@@ -96,7 +96,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
device_initialize(&devnode->dev); device_initialize(&devnode->dev);
/* Part 2: Initialize the character device */ /* 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) static void __exit media_devnode_exit(void)
{ {

4
target/linux/generic/hack-6.12/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch
View File

@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/page_pool.c --- a/net/core/page_pool.c
+++ b/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 delayed_work *dwq = to_delayed_work(wq);
struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw); struct page_pool *pool = container_of(dwq, typeof(*pool), release_dw);
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
inflight = page_pool_release(pool); inflight = page_pool_release(pool);
/* In rare cases, a driver bug may cause inflight to go negative. /* 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) if (inflight <= 0)
return; return;

4
target/linux/generic/kernel-6.12
View File

@@ -1,2 +1,2 @@
LINUX_VERSION-6.12 = .53 LINUX_VERSION-6.12 = .54
LINUX_KERNEL_HASH-6.12.53 = 663507accae673afcf4e210b4ae8d4352e61d926202e5da3f04bf71ca1d2c0b5 LINUX_KERNEL_HASH-6.12.54 = 1b0dcd3390efeec44e528748609bafcf36eae895bb68c8f62ac5e5940943de62

4
target/linux/generic/pending-6.12/812-PCI-sysfs-enforce-single-creation-of-sysfs-entry-for.patch
View File

@@ -68,7 +68,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
/* show configuration fields */ /* show configuration fields */
#define pci_config_attr(field, format_string) \ #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, .is_visible = resource_resize_is_visible,
}; };
@@ -102,7 +102,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@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_dev *pdev = NULL;
struct pci_bus *pbus = NULL; struct pci_bus *pbus = NULL;

4
target/linux/generic/pending-6.12/920-mangle_bootargs.patch
View File

@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
help help
--- a/init/main.c --- a/init/main.c
+++ b/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) { } static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif #endif
@@ -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
@@ -927,6 +950,7 @@ void start_kernel(void) @@ -939,6 +962,7 @@ void start_kernel(void)
jump_label_init(); jump_label_init();
static_call_init(); static_call_init();
early_security_init(); early_security_init();

2
target/linux/ipq806x/patches-6.12/902-ARM-decompressor-support-for-ATAGs-rootblock-parsing.patch
View File

@@ -177,7 +177,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/kprobes.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); pr_notice("Kernel command line: %s\n", saved_command_line);
/* parameters may set static keys */ /* parameters may set static keys */

2
target/linux/mvebu/patches-6.12/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
View File

@@ -258,7 +258,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static int kernel_init(void *); 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(); boot_cpu_hotplug_init();
pr_notice("Kernel command line: %s\n", saved_command_line); pr_notice("Kernel command line: %s\n", saved_command_line);