[openwrt/openwrt] kernel: bump 5.15 to 5.15.134
LEDE Commits
lede-commits at lists.infradead.org
Sun Oct 8 05:00:50 PDT 2023
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ac3a5911daeaecc04c6ffd03027b6b75fa4472d2
commit ac3a5911daeaecc04c6ffd03027b6b75fa4472d2
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Sat Oct 7 10:00:03 2023 -0400
kernel: bump 5.15 to 5.15.134
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.134
Removed upstreamed:
generic/backport-5.15/894-Fix-up-backport-for-13619703038.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.134&id=d7acb7031758141225844bea073860b48fd92092
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky at proton.me>
---
include/kernel-5.15 | 4 +--
.../020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch | 2 +-
.../894-Fix-up-backport-for-13619703038.patch | 31 ----------------------
...f_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch | 2 +-
...d-add-missing-linux-if_ether.h-for-ETH_AL.patch | 2 +-
.../patches-5.15/410-bt-mtk-serial-fix.patch | 2 +-
6 files changed, 6 insertions(+), 37 deletions(-)
diff --git a/include/kernel-5.15 b/include/kernel-5.15
index 06bcb632e3..35a21308aa 100644
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .133
-LINUX_KERNEL_HASH-5.15.133 = ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd
+LINUX_VERSION-5.15 = .134
+LINUX_KERNEL_HASH-5.15.134 = f37182aecb57ed6853d01e1074d3a60a653331e35f3115728381e08be050b9d3
diff --git a/target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch b/target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch
index cf5b8f0e9f..8ee032fb0f 100644
--- a/target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-10-mm-multi-gen-LRU-kill-switch.patch
@@ -116,7 +116,7 @@ Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
extern spinlock_t css_set_lock;
#define task_css_set_check(task, __c) \
rcu_dereference_check((task)->cgroups, \
-@@ -708,6 +719,8 @@ struct cgroup;
+@@ -709,6 +720,8 @@ struct cgroup;
static inline u64 cgroup_id(const struct cgroup *cgrp) { return 1; }
static inline void css_get(struct cgroup_subsys_state *css) {}
static inline void css_put(struct cgroup_subsys_state *css) {}
diff --git a/target/linux/generic/backport-5.15/894-Fix-up-backport-for-13619703038.patch b/target/linux/generic/backport-5.15/894-Fix-up-backport-for-13619703038.patch
deleted file mode 100644
index 674740eaac..0000000000
--- a/target/linux/generic/backport-5.15/894-Fix-up-backport-for-13619703038.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 16c572ef0646f8b0fa19fbf81b302de8a03127f2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal at kernel.org>
-Date: Sun, 24 Sep 2023 14:30:44 -0400
-Subject: Fix up backport of 136191703038 ("interconnect: Teach lockdep about
- icc_bw_lock order")
-
-Add a missing include to fix the following build error:
-
-drivers/interconnect/core.c: In function 'icc_init':
-drivers/interconnect/core.c:1148:9: error: implicit declaration of function 'fs_reclaim_acquire' [-Werror=implicit-function-declaration]
- 1148 | fs_reclaim_acquire(GFP_KERNEL);
- | ^~~~~~~~~~~~~~~~~~
-drivers/interconnect/core.c:1150:9: error: implicit declaration of function 'fs_reclaim_release' [-Werror=implicit-function-declaration]
- 1150 | fs_reclaim_release(GFP_KERNEL);
- | ^~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Sasha Levin <sashal at kernel.org>
----
- drivers/interconnect/core.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/interconnect/core.c
-+++ b/drivers/interconnect/core.c
-@@ -13,6 +13,7 @@
- #include <linux/interconnect.h>
- #include <linux/interconnect-provider.h>
- #include <linux/list.h>
-+#include <linux/sched/mm.h>
- #include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/slab.h>
diff --git a/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
index ba847d5f8a..b618c89613 100644
--- a/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
+++ b/target/linux/generic/pending-5.15/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -7729,7 +7729,7 @@ static int nft_register_flowtable_net_ho
+@@ -7707,7 +7707,7 @@ static int nft_register_flowtable_net_ho
err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev,
FLOW_BLOCK_BIND);
diff --git a/target/linux/generic/pending-5.15/780-ARM-kirkwood-add-missing-linux-if_ether.h-for-ETH_AL.patch b/target/linux/generic/pending-5.15/780-ARM-kirkwood-add-missing-linux-if_ether.h-for-ETH_AL.patch
index fcf7892c04..39ba71606e 100644
--- a/target/linux/generic/pending-5.15/780-ARM-kirkwood-add-missing-linux-if_ether.h-for-ETH_AL.patch
+++ b/target/linux/generic/pending-5.15/780-ARM-kirkwood-add-missing-linux-if_ether.h-for-ETH_AL.patch
@@ -51,7 +51,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
--- a/arch/arm/mach-mvebu/kirkwood.c
+++ b/arch/arm/mach-mvebu/kirkwood.c
-@@ -14,6 +14,7 @@
+@@ -11,6 +11,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mbus.h>
diff --git a/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch
index bfa90f3849..3f4597c65d 100644
--- a/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch
+++ b/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch
@@ -19,7 +19,7 @@
},
[PORT_NPCM] = {
.name = "Nuvoton 16550",
-@@ -2763,6 +2763,11 @@ serial8250_do_set_termios(struct uart_po
+@@ -2766,6 +2766,11 @@ serial8250_do_set_termios(struct uart_po
unsigned long flags;
unsigned int baud, quot, frac = 0;
More information about the lede-commits
mailing list