1
0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-06-15 19:53:59 +02:00

kernel: bump 5.10 to 5.10.194

All patches automatically rebased.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2023-09-03 12:55:54 +02:00
parent 49639b2d61
commit 188c49b321
6 changed files with 10 additions and 10 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .192
LINUX_KERNEL_HASH-5.10.192 = c40d11ee56e50a132429badbd1ba1c53e42b3312590b2a39be34c241d1b0b5b9
LINUX_VERSION-5.10 = .194
LINUX_KERNEL_HASH-5.10.194 = 240d5e47bb378c6813ecd07704fb887651ea7617159d2771071fd70bf33cd995

View File

@ -272,7 +272,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
struct device_node;
struct of_phandle_args;
@@ -828,6 +829,9 @@ int clk_save_context(void);
@@ -836,6 +837,9 @@ int clk_save_context(void);
*/
void clk_restore_context(void);

View File

@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5799,6 +5799,9 @@ int __init cgroup_init_early(void)
@@ -5800,6 +5800,9 @@ int __init cgroup_init_early(void)
return 0;
}
@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/**
* cgroup_init - cgroup initialization
*
@@ -5837,6 +5840,12 @@ int __init cgroup_init(void)
@@ -5838,6 +5841,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex);
@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
@@ -6374,6 +6383,10 @@ static int __init cgroup_disable(char *s
@@ -6378,6 +6387,10 @@ static int __init cgroup_disable(char *s
strcmp(token, ss->legacy_name))
continue;
@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static_branch_disable(cgroup_subsys_enabled_key[i]);
pr_info("Disabling %s control group subsystem\n",
ss->name);
@@ -6383,6 +6396,31 @@ static int __init cgroup_disable(char *s
@@ -6387,6 +6400,31 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);

View File

@ -8,7 +8,7 @@ This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
---
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -242,6 +242,9 @@
@@ -259,6 +259,9 @@
#ifndef cpu_has_pindexed_dcache
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
#endif

View File

@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!pe)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -3572,6 +3572,8 @@ static const struct seq_operations vmall
@@ -3576,6 +3576,8 @@ static const struct seq_operations vmall
static int __init proc_vmalloc_init(void)
{

View File

@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct rtnl_link {
rtnl_doit_func doit;
@@ -4690,7 +4690,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
@@ -4717,7 +4717,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
brport_nla_put_flag(skb, flags, mask,
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
brport_nla_put_flag(skb, flags, mask,