diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-18 23:51:48 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-19 22:47:17 +0200 |
| commit | a1d50e7b45080f60a0066e9ca88ad756480dd1f8 (patch) | |
| tree | 22dcfbbc4fc62d12483e9ffb961385d2da9993f3 /target/linux/generic/pending-5.4 | |
| parent | 88c8d0a2193bd3dd2cf00bc875def6155f2e34db (diff) | |
| download | upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.gz upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.bz2 upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.zip | |
kernel: bump 5.4 to 5.4.132
Manually rebased
layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch
All others updated automatically.
Compile-tested on: ramips/mt7621
Runtime-tested on: ramips/mt7621
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4')
6 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch index c4c13b9695..68a2d4d88f 100644 --- a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/init/Kconfig +++ b/init/Kconfig -@@ -1277,6 +1277,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW +@@ -1280,6 +1280,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW the unaligned access emulation. see arch/parisc/kernel/unaligned.c for reference diff --git a/target/linux/generic/pending-5.4/205-backtrace_module_info.patch b/target/linux/generic/pending-5.4/205-backtrace_module_info.patch index 39a4365113..6048c25957 100644 --- a/target/linux/generic/pending-5.4/205-backtrace_module_info.patch +++ b/target/linux/generic/pending-5.4/205-backtrace_module_info.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/lib/vsprintf.c +++ b/lib/vsprintf.c -@@ -914,8 +914,10 @@ char *symbol_string(char *buf, char *end +@@ -940,8 +940,10 @@ char *symbol_string(char *buf, char *end struct printf_spec spec, const char *fmt) { unsigned long value; @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif if (fmt[1] == 'R') -@@ -932,8 +934,14 @@ char *symbol_string(char *buf, char *end +@@ -958,8 +960,14 @@ char *symbol_string(char *buf, char *end return string_nocheck(buf, end, sym, spec); #else diff --git a/target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch index 8358a307cd..7692f484ae 100644 --- a/target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch +++ b/target/linux/generic/pending-5.4/419-mtd-redboot-add-of_match_table-with-DT-binding.patch @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -300,6 +300,7 @@ static int parse_redboot_partitions(stru +@@ -305,6 +305,7 @@ static int parse_redboot_partitions(stru static const struct of_device_id mtd_parser_redboot_of_match_table[] = { { .compatible = "redboot-fis" }, diff --git a/target/linux/generic/pending-5.4/420-mtd-redboot_space.patch b/target/linux/generic/pending-5.4/420-mtd-redboot_space.patch index a2cf838989..a3cd4ecf1f 100644 --- a/target/linux/generic/pending-5.4/420-mtd-redboot_space.patch +++ b/target/linux/generic/pending-5.4/420-mtd-redboot_space.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -274,14 +274,21 @@ static int parse_redboot_partitions(stru +@@ -279,14 +279,21 @@ static int parse_redboot_partitions(stru #endif names += strlen(names)+1; diff --git a/target/linux/generic/pending-5.4/630-packet_socket_type.patch b/target/linux/generic/pending-5.4/630-packet_socket_type.patch index a137fb5a6d..d9bfda1303 100644 --- a/target/linux/generic/pending-5.4/630-packet_socket_type.patch +++ b/target/linux/generic/pending-5.4/630-packet_socket_type.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3922,6 +3925,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3924,6 +3927,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> default: return -ENOPROTOOPT; } -@@ -3978,6 +3991,13 @@ static int packet_getsockopt(struct sock +@@ -3980,6 +3993,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch index 7523b396ba..83db92609b 100644 --- a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> --- a/init/Kconfig +++ b/init/Kconfig -@@ -1662,6 +1662,15 @@ config EMBEDDED +@@ -1665,6 +1665,15 @@ config EMBEDDED an embedded system so certain expert options are available for configuration. |