diff options
| author | John Audia | 2026-01-11 15:43:45 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-01-15 19:55:54 +0000 |
| commit | e4264e0a22288a8880f807c573a76a795b35fcd5 (patch) | |
| tree | 76d4a50279048f0396cb47645738d9ab22c74e95 | |
| parent | 31b1c6541ec08d34ad631c41ad960c2ee2a909af (diff) | |
| download | openwrt-e4264e0a22288a8880f807c573a76a795b35fcd5.tar.gz | |
kernel: bump 6.12 to 6.12.65
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.65
Manually rebased:
generic/hack-6.12/904-debloat_dma_buf.patch
econet/patches-6.12/010-v6.16-MAINTAINERS-Add-entry-for-newly-added-EcoNet-platfor.patch
Build system: x86/64
Build-tested: flogic/glinet_gl-mt6000
Run-tested: flogic/glinet_gl-mt6000
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/21431
(cherry picked from commit 226981d49c1255e74187103d8fbb1c5069bd89c8)
Link: https://github.com/openwrt/openwrt/pull/21546
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-6.12/720-04-v6.13-net-phy-mediatek-Re-organize-MediaTek-ethernet-phy-d.patch b/target/linux/generic/backport-6.12/720-04-v6.13-net-phy-mediatek-Re-organize-MediaTek-ethernet-phy-d.patch index 7161ffe069..81e2510912 100644 --- a/target/linux/generic/backport-6.12/720-04-v6.13-net-phy-mediatek-Re-organize-MediaTek-ethernet-phy-d.patch +++ b/target/linux/generic/backport-6.12/720-04-v6.13-net-phy-mediatek-Re-organize-MediaTek-ethernet-phy-d.patch @@ -1238,9 +1238,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> - } - - buf = (u32 *)nvmem_cell_read(cell, &len); +- nvmem_cell_put(cell); - if (IS_ERR(buf)) - return PTR_ERR(buf); -- nvmem_cell_put(cell); - - if (!buf[0] || !buf[1] || !buf[2] || !buf[3] || len < 4 * sizeof(u32)) { - phydev_err(phydev, "invalid efuse data\n"); diff --git a/target/linux/generic/hack-6.12/904-debloat_dma_buf.patch b/target/linux/generic/hack-6.12/904-debloat_dma_buf.patch index bceb474f1a..af566ec964 100644 --- a/target/linux/generic/hack-6.12/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-6.12/904-debloat_dma_buf.patch @@ -74,7 +74,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4433,6 +4433,7 @@ int wake_up_state(struct task_struct *p, +@@ -4434,6 +4434,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/kernel-6.12 b/target/linux/generic/kernel-6.12 index fe68547471..a43431c340 100644 --- a/target/linux/generic/kernel-6.12 +++ b/target/linux/generic/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = .64 -LINUX_KERNEL_HASH-6.12.64 = d1ad94a33681148efe884f4028970d69e332f2b003f0e8be53a1d25de38e49a2 +LINUX_VERSION-6.12 = .65 +LINUX_KERNEL_HASH-6.12.65 = 54e852667af35c0ed06cfc81311e65fa7f5f798a3bfcf78a559d3b4785a139c1 |