diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-06-20 10:50:45 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 00:57:16 +0200 |
| commit | b55efebb1fe99bae953adb8bd7743a61ffc40fb9 (patch) | |
| tree | ab4b0ed6496aa7c1af5b18508618e67ad4bfa918 /target/linux/generic/hack-5.15 | |
| parent | 251a382c28854ea68bd46483a58990eafbf671ca (diff) | |
| download | upstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.tar.gz upstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.tar.bz2 upstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.zip | |
kernel: bump 5.15 to 5.15.47
Deleted (upstreamed):
generic/backport-5.15/702-v5.19-32-net-ethernet-mtk_eth_soc-out-of-bounds-read-in-mtk_h.patch [01]
[01] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.47&id=b24ca1cf846273361d5bd73a35de95a486a54b6d
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
[Removed 702-v5.19-32-net-ethernet-mtk_eth_soc-out-of-bounds-read-in-mtk_h.patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-5.15')
3 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/generic/hack-5.15/204-module_strip.patch b/target/linux/generic/hack-5.15/204-module_strip.patch index 0634013691..bd7fc71060 100644 --- a/target/linux/generic/hack-5.15/204-module_strip.patch +++ b/target/linux/generic/hack-5.15/204-module_strip.patch @@ -143,7 +143,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -2033,7 +2033,9 @@ static void read_symbols(const char *mod +@@ -2034,7 +2034,9 @@ static void read_symbols(const char *mod symname = remove_dot(info.strtab + sym->st_name); handle_symbol(mod, &info, sym, symname); @@ -153,7 +153,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } for (sym = info.symtab_start; sym < info.symtab_stop; sym++) { -@@ -2212,8 +2214,10 @@ static void add_header(struct buffer *b, +@@ -2213,8 +2215,10 @@ static void add_header(struct buffer *b, buf_printf(b, "BUILD_SALT;\n"); buf_printf(b, "BUILD_LTO_INFO;\n"); buf_printf(b, "\n"); @@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n"); -@@ -2230,8 +2234,10 @@ static void add_header(struct buffer *b, +@@ -2231,8 +2235,10 @@ static void add_header(struct buffer *b, static void add_intree_flag(struct buffer *b, int is_intree) { @@ -175,7 +175,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } /* Cannot check for assembler */ -@@ -2244,8 +2250,10 @@ static void add_retpoline(struct buffer +@@ -2245,8 +2251,10 @@ static void add_retpoline(struct buffer static void add_staging_flag(struct buffer *b, const char *name) { @@ -186,7 +186,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } /** -@@ -2325,11 +2333,13 @@ static void add_depends(struct buffer *b +@@ -2326,11 +2334,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -200,7 +200,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } static void write_buf(struct buffer *b, const char *fname) -@@ -2578,7 +2588,9 @@ int main(int argc, char **argv) +@@ -2579,7 +2589,9 @@ int main(int argc, char **argv) add_staging_flag(&buf, mod->name); add_versions(&buf, mod); add_depends(&buf, mod); diff --git a/target/linux/generic/hack-5.15/221-module_exports.patch b/target/linux/generic/hack-5.15/221-module_exports.patch index 0164eabac0..95aef8edf8 100644 --- a/target/linux/generic/hack-5.15/221-module_exports.patch +++ b/target/linux/generic/hack-5.15/221-module_exports.patch @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> *(.modinfo) \ --- a/include/linux/export.h +++ b/include/linux/export.h -@@ -82,6 +82,12 @@ struct kernel_symbol { +@@ -84,6 +84,12 @@ struct kernel_symbol { #else @@ -80,7 +80,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* * For every exported symbol, do the following: * -@@ -99,7 +105,7 @@ struct kernel_symbol { +@@ -101,7 +107,7 @@ struct kernel_symbol { extern const char __kstrtab_##sym[]; \ extern const char __kstrtabns_##sym[]; \ __CRC_SYMBOL(sym, sec); \ diff --git a/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index 4e0654f8f3..5e2b2910ab 100644 --- a/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -1,6 +1,6 @@ --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2983,6 +2983,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -2981,6 +2981,9 @@ static int mv88e6xxx_setup_port(struct m else reg = 1 << port; |