298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-06-17 19:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.10 to 5.10.50

Browse Source
This commit is contained in:
coolsnowwolf 2021-07-16 18:32:33 +08:00
parent f0d208f443
commit ebe8ec1003
17 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif endif
LINUX_VERSION-5.4 = .132 LINUX_VERSION-5.4 = .132
LINUX_VERSION-5.10 = .46 LINUX_VERSION-5.10 = .50
LINUX_KERNEL_HASH-5.4.132 = 8466adbfb3579e751ede683496df7bb20f258b5f882250f3dd82be63736d00ef LINUX_KERNEL_HASH-5.4.132 = 8466adbfb3579e751ede683496df7bb20f258b5f882250f3dd82be63736d00ef
LINUX_KERNEL_HASH-5.10.46 = 569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415 LINUX_KERNEL_HASH-5.10.50 = 8bda327a7d95acfff8f87fb6ef4223e3194fa22195f5551249a9aa3393bfb436
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

2
target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -928,6 +928,17 @@ config LEDS_ACER_A500 @@ -929,6 +929,17 @@ config LEDS_ACER_A500
This option enables support for the Power Button LED of This option enables support for the Power Button LED of
Acer Iconia Tab A500. Acer Iconia Tab A500.

6
target/linux/ath79/patches-5.10/408-mtd-redboot_partition_scan.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/parsers/redboot.c --- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c
@@ -85,12 +85,18 @@ static int parse_redboot_partitions(stru @@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru
parse_redboot_of(master); parse_redboot_of(master);
@ -19,7 +19,7 @@
return -EIO; return -EIO;
} }
offset -= master->erasesize; offset -= master->erasesize;
@@ -103,10 +109,6 @@ static int parse_redboot_partitions(stru @@ -108,10 +114,6 @@ static int parse_redboot_partitions(stru
goto nogood; goto nogood;
} }
} }
@ -30,7 +30,7 @@
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
master->name, offset); master->name, offset);
@@ -179,6 +181,11 @@ static int parse_redboot_partitions(stru @@ -184,6 +186,11 @@ static int parse_redboot_partitions(stru
} }
if (i == numslots) { if (i == numslots) {
/* Didn't find it */ /* Didn't find it */

2
target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
View File

@ -267,7 +267,7 @@
case IPV6_2292HOPOPTS: case IPV6_2292HOPOPTS:
--- a/net/ipv6/exthdrs.c --- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c
@@ -949,7 +949,7 @@ static bool ipv6_hop_jumbo(struct sk_buf @@ -948,7 +948,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
goto drop; goto drop;
} }

4
target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mfd/Kconfig --- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig
@@ -2141,6 +2141,14 @@ config RAVE_SP_CORE @@ -2142,6 +2142,14 @@ config RAVE_SP_CORE
Select this to get support for the Supervisory Processor Select this to get support for the Supervisory Processor
device found on several devices in RAVE line of hardware. device found on several devices in RAVE line of hardware.
@ -27,7 +27,7 @@
obj-$(CONFIG_MFD_INTEL_M10_BMC) += intel-m10-bmc.o obj-$(CONFIG_MFD_INTEL_M10_BMC) += intel-m10-bmc.o
--- a/drivers/gpio/Kconfig --- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig
@@ -1518,6 +1518,12 @@ config GPIO_SODAVILLE @@ -1520,6 +1520,12 @@ config GPIO_SODAVILLE
help help
Say Y here to support Intel Sodaville GPIO. Say Y here to support Intel Sodaville GPIO.

6
target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch
View File

@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
.width = 2, .width = 2,
--- a/drivers/mtd/parsers/redboot.c --- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c
@@ -79,6 +79,7 @@ static int parse_redboot_partitions(stru @@ -84,6 +84,7 @@ static int parse_redboot_partitions(stru
int nulllen = 0; int nulllen = 0;
int numslots; int numslots;
unsigned long offset; unsigned long offset;
@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
static char nullstring[] = "unallocated"; static char nullstring[] = "unallocated";
#endif #endif
@@ -185,6 +186,16 @@ static int parse_redboot_partitions(stru @@ -190,6 +191,16 @@ static int parse_redboot_partitions(stru
goto out; goto out;
} }
@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
for (i = 0; i < numslots; i++) { for (i = 0; i < numslots; i++) {
struct fis_list *new_fl, **prev; struct fis_list *new_fl, **prev;
@@ -205,10 +216,10 @@ static int parse_redboot_partitions(stru @@ -210,10 +221,10 @@ static int parse_redboot_partitions(stru
goto out; goto out;
} }
new_fl->img = &buf[i]; new_fl->img = &buf[i];

4
target/linux/generic/hack-5.10/204-module_strip.patch
View File

@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config MODULES_TREE_LOOKUP config MODULES_TREE_LOOKUP
--- a/kernel/module.c --- a/kernel/module.c
+++ b/kernel/module.c +++ b/kernel/module.c
@@ -3243,9 +3243,11 @@ static int setup_load_info(struct load_i @@ -3247,9 +3247,11 @@ static int setup_load_info(struct load_i
static int check_modinfo(struct module *mod, struct load_info *info, int flags) static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{ {
@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (flags & MODULE_INIT_IGNORE_VERMAGIC) if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL; modmagic = NULL;
@@ -3266,6 +3268,7 @@ static int check_modinfo(struct module * @@ -3270,6 +3272,7 @@ static int check_modinfo(struct module *
mod->name); mod->name);
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
} }

2
target/linux/generic/hack-5.10/221-module_exports.patch
View File

@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
"__kstrtabns_" #sym ": \n" \ "__kstrtabns_" #sym ": \n" \
--- a/scripts/Makefile.build --- a/scripts/Makefile.build
+++ b/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) # Linker scripts preprocessor (.lds.S -> .lds)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
quiet_cmd_cpp_lds_S = LDS $@ quiet_cmd_cpp_lds_S = LDS $@

2
target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/net/sch_generic.h --- a/include/net/sch_generic.h
+++ b/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 pfifo_fast_ops;
extern struct Qdisc_ops mq_qdisc_ops; extern struct Qdisc_ops mq_qdisc_ops;
extern struct Qdisc_ops noqueue_qdisc_ops; extern struct Qdisc_ops noqueue_qdisc_ops;

4
target/linux/generic/pending-5.10/205-backtrace_module_info.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/lib/vsprintf.c --- a/lib/vsprintf.c
+++ b/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) struct printf_spec spec, const char *fmt)
{ {
unsigned long value; unsigned long value;
@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif #endif
if (fmt[1] == 'R') 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); return string_nocheck(buf, end, sym, spec);
#else #else

2
target/linux/generic/pending-5.10/419-mtd-redboot-add-of_match_table-with-DT-binding.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--- a/drivers/mtd/parsers/redboot.c --- a/drivers/mtd/parsers/redboot.c
+++ b/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[] = { static const struct of_device_id mtd_parser_redboot_of_match_table[] = {
{ .compatible = "redboot-fis" }, { .compatible = "redboot-fis" },

2
target/linux/generic/pending-5.10/420-mtd-redboot_space.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/mtd/parsers/redboot.c --- a/drivers/mtd/parsers/redboot.c
+++ b/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 #endif
names += strlen(names)+1; names += strlen(names)+1;

6
target/linux/generic/pending-5.10/630-packet_socket_type.patch
View File

@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop; goto drop;
@@ -3315,6 +3317,7 @@ static int packet_create(struct net *net @@ -3318,6 +3320,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock); mutex_init(&po->pg_vec_lock);
po->rollover = NULL; po->rollover = NULL;
po->prot_hook.func = packet_rcv; po->prot_hook.func = packet_rcv;
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET) if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt; po->prot_hook.func = packet_rcv_spkt;
@@ -3949,6 +3952,16 @@ packet_setsockopt(struct socket *sock, i @@ -3954,6 +3957,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit; po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0; return 0;
} }
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default: default:
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
@@ -4005,6 +4018,13 @@ static int packet_getsockopt(struct sock @@ -4010,6 +4023,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR: case PACKET_VNET_HDR:
val = po->has_vnet_hdr; val = po->has_vnet_hdr;
break; break;

4
target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View File

@ -311,7 +311,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
/** /**
* ip6_tnl_addr_conflict - compare packet addresses to tunnel's own * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
* @t: the outgoing tunnel device * @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) u8 protocol)
{ {
struct ip6_tnl *t = netdev_priv(dev); struct ip6_tnl *t = netdev_priv(dev);
@ -319,7 +319,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
struct ipv6hdr *ipv6h; struct ipv6hdr *ipv6h;
const struct iphdr *iph; const struct iphdr *iph;
int encap_limit = -1; 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); fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL);
dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield); dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield);

2
target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch
View File

@ -19,7 +19,7 @@
}, },
[PORT_NPCM] = { [PORT_NPCM] = {
.name = "Nuvoton 16550", .name = "Nuvoton 16550",
@@ -2699,6 +2699,11 @@ serial8250_do_set_termios(struct uart_po @@ -2712,6 +2712,11 @@ serial8250_do_set_termios(struct uart_po
unsigned long flags; unsigned long flags;
unsigned int baud, quot, frac = 0; unsigned int baud, quot, frac = 0;

2
target/linux/mediatek/patches-5.10/800-ubnt-ledbar-driver.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -928,6 +928,16 @@ config LEDS_ACER_A500 @@ -929,6 +929,16 @@ config LEDS_ACER_A500
This option enables support for the Power Button LED of This option enables support for the Power Button LED of
Acer Iconia Tab A500. Acer Iconia Tab A500.

2
target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/media/usb/uvc/uvc_driver.c --- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2972,6 +2972,18 @@ static const struct usb_device_id uvc_id @@ -3004,6 +3004,18 @@ static const struct usb_device_id uvc_id
.bInterfaceSubClass = 1, .bInterfaceSubClass = 1,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) }, .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },