kernel: bump 5.15 to 5.15.25 (#8929)
This commit is contained in:
parent
2788b735c3
commit
a430d48900
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .23
|
LINUX_VERSION-5.15 = .25
|
||||||
LINUX_KERNEL_HASH-5.15.23 = e839c6fe4db9327178ecccc7fb14035000496bb8028a32735213675eefa97a1c
|
LINUX_KERNEL_HASH-5.15.25 = 4399ffbe524a11b3c44bff6dd858ed31417341f58513f04cb6ae15e527543879
|
||||||
|
@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
device, it has to decide which ones to send first, which ones to
|
device, it has to decide which ones to send first, which ones to
|
||||||
--- a/net/sched/sch_api.c
|
--- a/net/sched/sch_api.c
|
||||||
+++ b/net/sched/sch_api.c
|
+++ b/net/sched/sch_api.c
|
||||||
@@ -2283,7 +2283,7 @@ static int __init pktsched_init(void)
|
@@ -2285,7 +2285,7 @@ static int __init pktsched_init(void)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -2321,6 +2321,7 @@ static int mv88e6xxx_port_fdb_add(struct
|
@@ -2328,6 +2328,7 @@ static int mv88e6xxx_port_fdb_add(struct
|
||||||
struct mv88e6xxx_chip *chip = ds->priv;
|
struct mv88e6xxx_chip *chip = ds->priv;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
@ -8,7 +8,7 @@
|
|||||||
mv88e6xxx_reg_lock(chip);
|
mv88e6xxx_reg_lock(chip);
|
||||||
err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,
|
err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,
|
||||||
MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);
|
MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);
|
||||||
@@ -2335,6 +2336,7 @@ static int mv88e6xxx_port_fdb_del(struct
|
@@ -2342,6 +2342,7 @@ static int mv88e6xxx_port_fdb_del(struct
|
||||||
struct mv88e6xxx_chip *chip = ds->priv;
|
struct mv88e6xxx_chip *chip = ds->priv;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -2983,6 +2983,9 @@ static int mv88e6xxx_setup_port(struct m
|
@@ -2988,6 +2988,9 @@ static int mv88e6xxx_setup_port(struct m
|
||||||
else
|
else
|
||||||
reg = 1 << port;
|
reg = 1 << port;
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
{
|
{
|
||||||
--- a/drivers/gpio/gpiolib-sysfs.c
|
--- a/drivers/gpio/gpiolib-sysfs.c
|
||||||
+++ b/drivers/gpio/gpiolib-sysfs.c
|
+++ b/drivers/gpio/gpiolib-sysfs.c
|
||||||
@@ -564,7 +564,7 @@ static struct class gpio_class = {
|
@@ -561,7 +561,7 @@ static struct class gpio_class = {
|
||||||
*
|
*
|
||||||
* Returns zero on success, else an error.
|
* Returns zero on success, else an error.
|
||||||
*/
|
*/
|
||||||
|
@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/net/ipv4/fib_trie.c
|
--- a/net/ipv4/fib_trie.c
|
||||||
+++ b/net/ipv4/fib_trie.c
|
+++ b/net/ipv4/fib_trie.c
|
||||||
@@ -3015,11 +3015,13 @@ static const struct seq_operations fib_r
|
@@ -3018,11 +3018,13 @@ static const struct seq_operations fib_r
|
||||||
|
|
||||||
int __net_init fib_proc_init(struct net *net)
|
int __net_init fib_proc_init(struct net *net)
|
||||||
{
|
{
|
||||||
@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
fib_triestat_seq_show, NULL))
|
fib_triestat_seq_show, NULL))
|
||||||
goto out2;
|
goto out2;
|
||||||
|
|
||||||
@@ -3030,17 +3032,21 @@ int __net_init fib_proc_init(struct net
|
@@ -3033,17 +3035,21 @@ int __net_init fib_proc_init(struct net
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out3:
|
out3:
|
||||||
|
@ -261,7 +261,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
|
|||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
/*
|
/*
|
||||||
@@ -181,9 +182,15 @@ kexec_indirection_page:
|
@@ -181,9 +182,15 @@ kexec_indirection_page:
|
||||||
PTR 0
|
PTR_WD 0
|
||||||
.size kexec_indirection_page, PTRSIZE
|
.size kexec_indirection_page, PTRSIZE
|
||||||
|
|
||||||
-relocate_new_kernel_end:
|
-relocate_new_kernel_end:
|
||||||
@ -277,7 +277,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
|
|||||||
|
|
||||||
-relocate_new_kernel_size:
|
-relocate_new_kernel_size:
|
||||||
- EXPORT(relocate_new_kernel_size)
|
- EXPORT(relocate_new_kernel_size)
|
||||||
- PTR relocate_new_kernel_end - relocate_new_kernel
|
- PTR_WD relocate_new_kernel_end - relocate_new_kernel
|
||||||
- .size relocate_new_kernel_size, PTRSIZE
|
- .size relocate_new_kernel_size, PTRSIZE
|
||||||
+kexec_relocate_new_kernel_end:
|
+kexec_relocate_new_kernel_end:
|
||||||
+ EXPORT(kexec_relocate_new_kernel_end)
|
+ EXPORT(kexec_relocate_new_kernel_end)
|
||||||
|
@ -20,7 +20,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
|
|
||||||
--- a/include/net/netns/ipv6.h
|
--- a/include/net/netns/ipv6.h
|
||||||
+++ b/include/net/netns/ipv6.h
|
+++ b/include/net/netns/ipv6.h
|
||||||
@@ -84,6 +84,7 @@ struct netns_ipv6 {
|
@@ -85,6 +85,7 @@ struct netns_ipv6 {
|
||||||
unsigned int fib6_routes_require_src;
|
unsigned int fib6_routes_require_src;
|
||||||
#endif
|
#endif
|
||||||
struct rt6_info *ip6_prohibit_entry;
|
struct rt6_info *ip6_prohibit_entry;
|
||||||
@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
static void rt_fibinfo_free(struct rtable __rcu **rtp)
|
static void rt_fibinfo_free(struct rtable __rcu **rtp)
|
||||||
--- a/net/ipv4/fib_trie.c
|
--- a/net/ipv4/fib_trie.c
|
||||||
+++ b/net/ipv4/fib_trie.c
|
+++ b/net/ipv4/fib_trie.c
|
||||||
@@ -2763,6 +2763,7 @@ static const char *const rtn_type_names[
|
@@ -2767,6 +2767,7 @@ static const char *const rtn_type_names[
|
||||||
[RTN_THROW] = "THROW",
|
[RTN_THROW] = "THROW",
|
||||||
[RTN_NAT] = "NAT",
|
[RTN_NAT] = "NAT",
|
||||||
[RTN_XRESOLVE] = "XRESOLVE",
|
[RTN_XRESOLVE] = "XRESOLVE",
|
||||||
|
@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -3193,6 +3193,7 @@ static int mv88e6xxx_setup(struct dsa_sw
|
@@ -3200,6 +3200,7 @@ static int mv88e6xxx_setup(struct dsa_sw
|
||||||
|
|
||||||
chip->ds = ds;
|
chip->ds = ds;
|
||||||
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
|
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
|
||||||
|
@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -6314,6 +6314,7 @@ static int mv88e6xxx_register_switch(str
|
@@ -6325,6 +6325,7 @@ static int mv88e6xxx_register_switch(str
|
||||||
ds->ops = &mv88e6xxx_switch_ops;
|
ds->ops = &mv88e6xxx_switch_ops;
|
||||||
ds->ageing_time_min = chip->info->age_time_coeff;
|
ds->ageing_time_min = chip->info->age_time_coeff;
|
||||||
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user