mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 6.1 to 6.1.79 (#11916)
This commit is contained in:
parent
5a1eaf2a0b
commit
14468698a1
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.1 = .78
|
LINUX_VERSION-6.1 = .79
|
||||||
LINUX_KERNEL_HASH-6.1.78 = 65206b969831236849c9906eba267e715734a93808e9909fd9b4f12eea10d689
|
LINUX_KERNEL_HASH-6.1.79 = faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b
|
||||||
|
@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
|
|
||||||
--- a/drivers/of/property.c
|
--- a/drivers/of/property.c
|
||||||
+++ b/drivers/of/property.c
|
+++ b/drivers/of/property.c
|
||||||
@@ -1144,8 +1144,8 @@ static struct device_node *parse_prop_ce
|
@@ -1146,8 +1146,8 @@ static struct device_node *parse_prop_ce
|
||||||
if (strcmp(prop_name, list_name))
|
if (strcmp(prop_name, list_name))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
|
|
||||||
--- a/drivers/of/property.c
|
--- a/drivers/of/property.c
|
||||||
+++ b/drivers/of/property.c
|
+++ b/drivers/of/property.c
|
||||||
@@ -1249,7 +1249,7 @@ DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-c
|
@@ -1251,7 +1251,7 @@ DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-c
|
||||||
DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells")
|
DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells")
|
||||||
DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells")
|
DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells")
|
||||||
DEFINE_SIMPLE_PROP(extcon, "extcon", NULL)
|
DEFINE_SIMPLE_PROP(extcon, "extcon", NULL)
|
||||||
|
@ -141,7 +141,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/scripts/mod/modpost.c
|
--- a/scripts/mod/modpost.c
|
||||||
+++ b/scripts/mod/modpost.c
|
+++ b/scripts/mod/modpost.c
|
||||||
@@ -1781,7 +1781,9 @@ static void read_symbols(const char *mod
|
@@ -1785,7 +1785,9 @@ static void read_symbols(const char *mod
|
||||||
symname = remove_dot(info.strtab + sym->st_name);
|
symname = remove_dot(info.strtab + sym->st_name);
|
||||||
|
|
||||||
handle_symbol(mod, &info, sym, symname);
|
handle_symbol(mod, &info, sym, symname);
|
||||||
@ -151,7 +151,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {
|
for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {
|
||||||
@@ -1944,8 +1946,10 @@ static void add_header(struct buffer *b,
|
@@ -1948,8 +1950,10 @@ static void add_header(struct buffer *b,
|
||||||
buf_printf(b, "BUILD_SALT;\n");
|
buf_printf(b, "BUILD_SALT;\n");
|
||||||
buf_printf(b, "BUILD_LTO_INFO;\n");
|
buf_printf(b, "BUILD_LTO_INFO;\n");
|
||||||
buf_printf(b, "\n");
|
buf_printf(b, "\n");
|
||||||
@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
buf_printf(b, "\n");
|
buf_printf(b, "\n");
|
||||||
buf_printf(b, "__visible struct module __this_module\n");
|
buf_printf(b, "__visible struct module __this_module\n");
|
||||||
buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n");
|
buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n");
|
||||||
@@ -1959,8 +1963,10 @@ static void add_header(struct buffer *b,
|
@@ -1963,8 +1967,10 @@ static void add_header(struct buffer *b,
|
||||||
buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n");
|
buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n");
|
||||||
buf_printf(b, "};\n");
|
buf_printf(b, "};\n");
|
||||||
|
|
||||||
@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
buf_printf(b,
|
buf_printf(b,
|
||||||
"\n"
|
"\n"
|
||||||
@@ -1968,8 +1974,10 @@ static void add_header(struct buffer *b,
|
@@ -1972,8 +1978,10 @@ static void add_header(struct buffer *b,
|
||||||
"MODULE_INFO(retpoline, \"Y\");\n"
|
"MODULE_INFO(retpoline, \"Y\");\n"
|
||||||
"#endif\n");
|
"#endif\n");
|
||||||
|
|
||||||
@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
if (strstarts(mod->name, "tools/testing"))
|
if (strstarts(mod->name, "tools/testing"))
|
||||||
buf_printf(b, "\nMODULE_INFO(test, \"Y\");\n");
|
buf_printf(b, "\nMODULE_INFO(test, \"Y\");\n");
|
||||||
@@ -2065,11 +2073,13 @@ static void add_depends(struct buffer *b
|
@@ -2069,11 +2077,13 @@ static void add_depends(struct buffer *b
|
||||||
|
|
||||||
static void add_srcversion(struct buffer *b, struct module *mod)
|
static void add_srcversion(struct buffer *b, struct module *mod)
|
||||||
{
|
{
|
||||||
@ -198,7 +198,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void write_buf(struct buffer *b, const char *fname)
|
static void write_buf(struct buffer *b, const char *fname)
|
||||||
@@ -2155,7 +2165,9 @@ static void write_mod_c_file(struct modu
|
@@ -2159,7 +2169,9 @@ static void write_mod_c_file(struct modu
|
||||||
add_exported_symbols(&buf, mod);
|
add_exported_symbols(&buf, mod);
|
||||||
add_versions(&buf, mod);
|
add_versions(&buf, mod);
|
||||||
add_depends(&buf, mod);
|
add_depends(&buf, mod);
|
||||||
|
@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
/* Align . to a 8 byte boundary equals to maximum function alignment. */
|
/* Align . to a 8 byte boundary equals to maximum function alignment. */
|
||||||
#define ALIGN_FUNCTION() . = ALIGN(8)
|
#define ALIGN_FUNCTION() . = ALIGN(8)
|
||||||
|
|
||||||
@@ -512,14 +522,14 @@
|
@@ -511,14 +521,14 @@
|
||||||
/* Kernel symbol table: Normal symbols */ \
|
/* Kernel symbol table: Normal symbols */ \
|
||||||
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
|
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
|
||||||
__start___ksymtab = .; \
|
__start___ksymtab = .; \
|
||||||
@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
__stop___ksymtab_gpl = .; \
|
__stop___ksymtab_gpl = .; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
@@ -539,7 +549,7 @@
|
@@ -538,7 +548,7 @@
|
||||||
\
|
\
|
||||||
/* Kernel symbol table: strings */ \
|
/* Kernel symbol table: strings */ \
|
||||||
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
|
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
|
||||||
@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* __*init sections */ \
|
/* __*init sections */ \
|
||||||
@@ -1048,6 +1058,8 @@
|
@@ -1042,6 +1052,8 @@
|
||||||
#define COMMON_DISCARDS \
|
#define COMMON_DISCARDS \
|
||||||
SANITIZER_DISCARDS \
|
SANITIZER_DISCARDS \
|
||||||
PATCHABLE_DISCARDS \
|
PATCHABLE_DISCARDS \
|
||||||
|
@ -10,7 +10,7 @@ Subject: [PATCH] Kconfig: add tristate for OID and ASNI string
|
|||||||
|
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -2004,7 +2004,7 @@ config PADATA
|
@@ -2013,7 +2013,7 @@ config PADATA
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config ASN1
|
config ASN1
|
||||||
|
@ -19,7 +19,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|||||||
|
|
||||||
--- a/drivers/base/core.c
|
--- a/drivers/base/core.c
|
||||||
+++ b/drivers/base/core.c
|
+++ b/drivers/base/core.c
|
||||||
@@ -1700,7 +1700,7 @@ static void device_links_purge(struct de
|
@@ -1702,7 +1702,7 @@ static void device_links_purge(struct de
|
||||||
#define FW_DEVLINK_FLAGS_RPM (FW_DEVLINK_FLAGS_ON | \
|
#define FW_DEVLINK_FLAGS_RPM (FW_DEVLINK_FLAGS_ON | \
|
||||||
DL_FLAG_PM_RUNTIME)
|
DL_FLAG_PM_RUNTIME)
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -606,7 +606,7 @@ endif
|
@@ -605,7 +605,7 @@ endif
|
||||||
# Allows the usage of unstable features in stable compilers.
|
# Allows the usage of unstable features in stable compilers.
|
||||||
export RUSTC_BOOTSTRAP := 1
|
export RUSTC_BOOTSTRAP := 1
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -1482,6 +1482,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
|
@@ -1491,6 +1491,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
|
||||||
the unaligned access emulation.
|
the unaligned access emulation.
|
||||||
see arch/parisc/kernel/unaligned.c for reference
|
see arch/parisc/kernel/unaligned.c for reference
|
||||||
|
|
||||||
@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/scripts/link-vmlinux.sh
|
--- a/scripts/link-vmlinux.sh
|
||||||
+++ b/scripts/link-vmlinux.sh
|
+++ b/scripts/link-vmlinux.sh
|
||||||
@@ -160,6 +160,10 @@ kallsyms()
|
@@ -165,6 +165,10 @@ kallsyms()
|
||||||
kallsymopt="${kallsymopt} --lto-clang"
|
kallsymopt="${kallsymopt} --lto-clang"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
|
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -1827,6 +1827,15 @@ config EMBEDDED
|
@@ -1836,6 +1836,15 @@ config EMBEDDED
|
||||||
an embedded system so certain expert options are available
|
an embedded system so certain expert options are available
|
||||||
for configuration.
|
for configuration.
|
||||||
|
|
||||||
|
@ -138,7 +138,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
|
|||||||
if (alloc_lpis) {
|
if (alloc_lpis) {
|
||||||
lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
|
lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
|
||||||
if (lpi_map)
|
if (lpi_map)
|
||||||
@@ -4727,6 +4764,13 @@ static bool __maybe_unused its_enable_qu
|
@@ -4731,6 +4768,13 @@ static bool __maybe_unused its_enable_qu
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -152,7 +152,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
|
|||||||
static const struct gic_quirk its_quirks[] = {
|
static const struct gic_quirk its_quirks[] = {
|
||||||
#ifdef CONFIG_CAVIUM_ERRATUM_22375
|
#ifdef CONFIG_CAVIUM_ERRATUM_22375
|
||||||
{
|
{
|
||||||
@@ -4773,6 +4817,14 @@ static const struct gic_quirk its_quirks
|
@@ -4777,6 +4821,14 @@ static const struct gic_quirk its_quirks
|
||||||
.init = its_enable_quirk_hip07_161600802,
|
.init = its_enable_quirk_hip07_161600802,
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
@ -167,7 +167,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -5028,6 +5080,7 @@ static int __init its_probe_one(struct r
|
@@ -5032,6 +5084,7 @@ static int __init its_probe_one(struct r
|
||||||
struct page *page;
|
struct page *page;
|
||||||
u32 ctlr;
|
u32 ctlr;
|
||||||
int err;
|
int err;
|
||||||
@ -175,7 +175,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
|
|||||||
|
|
||||||
its_base = its_map_one(res, &err);
|
its_base = its_map_one(res, &err);
|
||||||
if (!its_base)
|
if (!its_base)
|
||||||
@@ -5081,7 +5134,9 @@ static int __init its_probe_one(struct r
|
@@ -5085,7 +5138,9 @@ static int __init its_probe_one(struct r
|
||||||
|
|
||||||
its->numa_node = numa_node;
|
its->numa_node = numa_node;
|
||||||
|
|
||||||
@ -186,7 +186,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
|
|||||||
get_order(ITS_CMD_QUEUE_SZ));
|
get_order(ITS_CMD_QUEUE_SZ));
|
||||||
if (!page) {
|
if (!page) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
@@ -5112,6 +5167,9 @@ static int __init its_probe_one(struct r
|
@@ -5116,6 +5171,9 @@ static int __init its_probe_one(struct r
|
||||||
gits_write_cbaser(baser, its->base + GITS_CBASER);
|
gits_write_cbaser(baser, its->base + GITS_CBASER);
|
||||||
tmp = gits_read_cbaser(its->base + GITS_CBASER);
|
tmp = gits_read_cbaser(its->base + GITS_CBASER);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user