mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-08 03:50:48 +00:00
kernel: bump 5.15 to 5.15.129
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.129 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 1db566b6928447ff4c4f86ad1be7e0a6d5a58d16) [Refresh on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
3c1721ae03
commit
8bf25dba77
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .128
|
LINUX_VERSION-5.15 = .129
|
||||||
LINUX_KERNEL_HASH-5.15.128 = 0f2eca845183fd76f53b0c867c97f12b9ace2d7e8ee2cdeec7eb2897651b80de
|
LINUX_KERNEL_HASH-5.15.129 = 750ec97ce4f1473e392b367a55eca4ea7a6b1e9e65ca2fb3bbca2eaa64802b66
|
||||||
|
@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
|
|
||||||
--- a/kernel/cgroup/cgroup.c
|
--- a/kernel/cgroup/cgroup.c
|
||||||
+++ b/kernel/cgroup/cgroup.c
|
+++ b/kernel/cgroup/cgroup.c
|
||||||
@@ -5889,6 +5889,9 @@ int __init cgroup_init_early(void)
|
@@ -5890,6 +5890,9 @@ int __init cgroup_init_early(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
/**
|
/**
|
||||||
* cgroup_init - cgroup initialization
|
* cgroup_init - cgroup initialization
|
||||||
*
|
*
|
||||||
@@ -5927,6 +5930,12 @@ int __init cgroup_init(void)
|
@@ -5928,6 +5931,12 @@ int __init cgroup_init(void)
|
||||||
|
|
||||||
mutex_unlock(&cgroup_mutex);
|
mutex_unlock(&cgroup_mutex);
|
||||||
|
|
||||||
@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
for_each_subsys(ss, ssid) {
|
for_each_subsys(ss, ssid) {
|
||||||
if (ss->early_init) {
|
if (ss->early_init) {
|
||||||
struct cgroup_subsys_state *css =
|
struct cgroup_subsys_state *css =
|
||||||
@@ -6516,6 +6525,10 @@ static int __init cgroup_disable(char *s
|
@@ -6520,6 +6529,10 @@ static int __init cgroup_disable(char *s
|
||||||
strcmp(token, ss->legacy_name))
|
strcmp(token, ss->legacy_name))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
static_branch_disable(cgroup_subsys_enabled_key[i]);
|
static_branch_disable(cgroup_subsys_enabled_key[i]);
|
||||||
pr_info("Disabling %s control group subsystem\n",
|
pr_info("Disabling %s control group subsystem\n",
|
||||||
ss->name);
|
ss->name);
|
||||||
@@ -6534,6 +6547,31 @@ static int __init cgroup_disable(char *s
|
@@ -6538,6 +6551,31 @@ static int __init cgroup_disable(char *s
|
||||||
}
|
}
|
||||||
__setup("cgroup_disable=", cgroup_disable);
|
__setup("cgroup_disable=", cgroup_disable);
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|||||||
KUNIT_CASE(clk_test_orphan_transparent_multiple_parent_mux_set_parent_set_range_modified),
|
KUNIT_CASE(clk_test_orphan_transparent_multiple_parent_mux_set_parent_set_range_modified),
|
||||||
--- a/include/linux/clk.h
|
--- a/include/linux/clk.h
|
||||||
+++ b/include/linux/clk.h
|
+++ b/include/linux/clk.h
|
||||||
@@ -829,8 +829,9 @@ int clk_set_parent(struct clk *clk, stru
|
@@ -837,8 +837,9 @@ int clk_set_parent(struct clk *clk, stru
|
||||||
* clk_get_parent - get the parent clock source for this clock
|
* clk_get_parent - get the parent clock source for this clock
|
||||||
* @clk: clock source
|
* @clk: clock source
|
||||||
*
|
*
|
||||||
|
@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|||||||
*
|
*
|
||||||
--- a/include/linux/clk.h
|
--- a/include/linux/clk.h
|
||||||
+++ b/include/linux/clk.h
|
+++ b/include/linux/clk.h
|
||||||
@@ -799,6 +799,17 @@ bool clk_has_parent(struct clk *clk, str
|
@@ -807,6 +807,17 @@ bool clk_has_parent(struct clk *clk, str
|
||||||
int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max);
|
int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -8,7 +8,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
|
|||||||
---
|
---
|
||||||
--- a/arch/mips/include/asm/cpu-features.h
|
--- a/arch/mips/include/asm/cpu-features.h
|
||||||
+++ b/arch/mips/include/asm/cpu-features.h
|
+++ b/arch/mips/include/asm/cpu-features.h
|
||||||
@@ -240,6 +240,9 @@
|
@@ -257,6 +257,9 @@
|
||||||
#ifndef cpu_has_pindexed_dcache
|
#ifndef cpu_has_pindexed_dcache
|
||||||
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
|
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
|
||||||
#endif
|
#endif
|
||||||
|
@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (!pe)
|
if (!pe)
|
||||||
--- a/mm/vmalloc.c
|
--- a/mm/vmalloc.c
|
||||||
+++ b/mm/vmalloc.c
|
+++ b/mm/vmalloc.c
|
||||||
@@ -3964,6 +3964,8 @@ static const struct seq_operations vmall
|
@@ -3968,6 +3968,8 @@ static const struct seq_operations vmall
|
||||||
|
|
||||||
static int __init proc_vmalloc_init(void)
|
static int __init proc_vmalloc_init(void)
|
||||||
{
|
{
|
||||||
|
@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
struct rtnl_link {
|
struct rtnl_link {
|
||||||
rtnl_doit_func doit;
|
rtnl_doit_func doit;
|
||||||
@@ -4712,7 +4712,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
@@ -4739,7 +4739,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user