From b71767d8e047b06668ca8b7b7922f6df238ab659 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 14 Jul 2021 17:42:28 +0100 Subject: kernel: bump 5.10 to 5.10.50 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra --- target/linux/generic/hack-5.10/221-module_exports.patch | 2 +- target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch | 2 +- target/linux/generic/pending-5.10/205-backtrace_module_info.patch | 4 ++-- .../419-mtd-redboot-add-of_match_table-with-DT-binding.patch | 2 +- target/linux/generic/pending-5.10/420-mtd-redboot_space.patch | 2 +- .../pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/hack-5.10/221-module_exports.patch b/target/linux/generic/hack-5.10/221-module_exports.patch index e6854138e7..2fcb2d9809 100644 --- a/target/linux/generic/hack-5.10/221-module_exports.patch +++ b/target/linux/generic/hack-5.10/221-module_exports.patch @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau "__kstrtabns_" #sym ": \n" \ --- a/scripts/Makefile.build +++ b/scripts/Makefile.build -@@ -366,7 +366,7 @@ targets += $(lib-y) $(always-y) $(MAKECM +@@ -367,7 +367,7 @@ targets += $(lib-y) $(always-y) $(MAKECM # Linker scripts preprocessor (.lds.S -> .lds) # --------------------------------------------------------------------------- quiet_cmd_cpp_lds_S = LDS $@ diff --git a/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch index 863738e2ef..33c8c55ab6 100644 --- a/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -611,12 +611,13 @@ extern struct Qdisc_ops noop_qdisc_ops; +@@ -623,12 +623,13 @@ extern struct Qdisc_ops noop_qdisc_ops; extern struct Qdisc_ops pfifo_fast_ops; extern struct Qdisc_ops mq_qdisc_ops; extern struct Qdisc_ops noqueue_qdisc_ops; diff --git a/target/linux/generic/pending-5.10/205-backtrace_module_info.patch b/target/linux/generic/pending-5.10/205-backtrace_module_info.patch index 5953214757..f46877f254 100644 --- a/target/linux/generic/pending-5.10/205-backtrace_module_info.patch +++ b/target/linux/generic/pending-5.10/205-backtrace_module_info.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/lib/vsprintf.c +++ b/lib/vsprintf.c -@@ -957,8 +957,10 @@ char *symbol_string(char *buf, char *end +@@ -983,8 +983,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 #endif if (fmt[1] == 'R') -@@ -975,8 +977,14 @@ char *symbol_string(char *buf, char *end +@@ -1001,8 +1003,14 @@ char *symbol_string(char *buf, char *end return string_nocheck(buf, end, sym, spec); #else diff --git a/target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch index 8358a307cd..7692f484ae 100644 --- a/target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch +++ b/target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki --- 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.10/420-mtd-redboot_space.patch b/target/linux/generic/pending-5.10/420-mtd-redboot_space.patch index a2cf838989..a3cd4ecf1f 100644 --- a/target/linux/generic/pending-5.10/420-mtd-redboot_space.patch +++ b/target/linux/generic/pending-5.10/420-mtd-redboot_space.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- 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.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch index ddb94fbe55..89eb7d61b3 100644 --- a/target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch +++ b/target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch @@ -311,7 +311,7 @@ Signed-off-by: Steven Barth /** * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own * @t: the outgoing tunnel device -@@ -1306,6 +1454,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str +@@ -1304,6 +1452,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str u8 protocol) { struct ip6_tnl *t = netdev_priv(dev); @@ -319,7 +319,7 @@ Signed-off-by: Steven Barth struct ipv6hdr *ipv6h; const struct iphdr *iph; int encap_limit = -1; -@@ -1405,6 +1554,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str +@@ -1403,6 +1552,18 @@ ipxip6_tnl_xmit(struct sk_buff *skb, str fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL); dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield); -- cgit v1.2.3