forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kernel: bump 5.10 to 5.10.113 (coolsnowwolf#9341)
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <[email protected]> Co-authored-by: John Audia <[email protected]>
- Loading branch information
1 parent
80a98e5
commit 4ddd124
Showing
7 changed files
with
20 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-5.10 = .112 | ||
LINUX_KERNEL_HASH-5.10.112 = 8c6c1dc361ebb1ef63a7666b2069c9d7cdcec8ebb706b03780af1c8bb03b4aa5 | ||
LINUX_VERSION-5.10 = .113 | ||
LINUX_KERNEL_HASH-5.10.113 = 82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | ||
+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | ||
@@ -299,6 +299,7 @@ static int rpi_touchscreen_enable(struct | ||
@@ -299,6 +299,7 @@ static int rpi_touchscreen_prepare(struc | ||
int i; | ||
|
||
rpi_touchscreen_i2c_write(ts, REG_POWERON, 1); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -423,15 +423,15 @@ Signed-off-by: David S. Miller <[email protected]> | |
if (bgmac->irq < 0) | ||
--- a/drivers/net/ethernet/cadence/macb_main.c | ||
+++ b/drivers/net/ethernet/cadence/macb_main.c | ||
@@ -4479,7 +4479,6 @@ static int macb_probe(struct platform_de | ||
@@ -4487,7 +4487,6 @@ static int macb_probe(struct platform_de | ||
struct net_device *dev; | ||
struct resource *regs; | ||
void __iomem *mem; | ||
- const char *mac; | ||
struct macb *bp; | ||
int err, val; | ||
|
||
@@ -4592,15 +4591,11 @@ static int macb_probe(struct platform_de | ||
@@ -4600,15 +4599,11 @@ static int macb_probe(struct platform_de | ||
if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR) | ||
bp->rx_intr_mask |= MACB_BIT(RXUBR); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -87,15 +87,15 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (!net_eq(dev_net(dev), sock_net(sk))) | ||
goto drop; | ||
|
||
@@ -3325,6 +3327,7 @@ static int packet_create(struct net *net | ||
@@ -3330,6 +3332,7 @@ static int packet_create(struct net *net | ||
mutex_init(&po->pg_vec_lock); | ||
po->rollover = NULL; | ||
po->prot_hook.func = packet_rcv; | ||
+ po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK); | ||
|
||
if (sock->type == SOCK_PACKET) | ||
po->prot_hook.func = packet_rcv_spkt; | ||
@@ -3969,6 +3972,16 @@ packet_setsockopt(struct socket *sock, i | ||
@@ -3974,6 +3977,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 <[email protected]> | |
default: | ||
return -ENOPROTOOPT; | ||
} | ||
@@ -4025,6 +4038,13 @@ static int packet_getsockopt(struct sock | ||
@@ -4030,6 +4043,13 @@ static int packet_getsockopt(struct sock | ||
case PACKET_VNET_HDR: | ||
val = po->has_vnet_hdr; | ||
break; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
case RTN_THROW: | ||
case RTN_UNREACHABLE: | ||
default: | ||
@@ -4448,6 +4467,17 @@ static int ip6_pkt_prohibit_out(struct n | ||
@@ -4449,6 +4468,17 @@ static int ip6_pkt_prohibit_out(struct n | ||
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); | ||
} | ||
|
||
|
@@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
/* | ||
* Allocate a dst for local (unicast / anycast) address. | ||
*/ | ||
@@ -4928,7 +4958,8 @@ static int rtm_to_fib6_config(struct sk_ | ||
@@ -4929,7 +4959,8 @@ static int rtm_to_fib6_config(struct sk_ | ||
if (rtm->rtm_type == RTN_UNREACHABLE || | ||
rtm->rtm_type == RTN_BLACKHOLE || | ||
rtm->rtm_type == RTN_PROHIBIT || | ||
|
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
cfg->fc_flags |= RTF_REJECT; | ||
|
||
if (rtm->rtm_type == RTN_LOCAL) | ||
@@ -6127,6 +6158,8 @@ static int ip6_route_dev_notify(struct n | ||
@@ -6128,6 +6159,8 @@ static int ip6_route_dev_notify(struct n | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
net->ipv6.ip6_prohibit_entry->dst.dev = dev; | ||
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); | ||
|
@@ -194,15 +194,15 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_blk_hole_entry->dst.dev = dev; | ||
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); | ||
#endif | ||
@@ -6138,6 +6171,7 @@ static int ip6_route_dev_notify(struct n | ||
@@ -6139,6 +6172,7 @@ static int ip6_route_dev_notify(struct n | ||
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); | ||
+ in6_dev_put_clear(&net->ipv6.ip6_policy_failed_entry->rt6i_idev); | ||
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); | ||
#endif | ||
} | ||
@@ -6329,6 +6363,8 @@ static int __net_init ip6_route_net_init | ||
@@ -6330,6 +6364,8 @@ static int __net_init ip6_route_net_init | ||
|
||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
net->ipv6.fib6_has_custom_rules = false; | ||
|
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, | ||
sizeof(*net->ipv6.ip6_prohibit_entry), | ||
GFP_KERNEL); | ||
@@ -6339,11 +6375,21 @@ static int __net_init ip6_route_net_init | ||
@@ -6340,11 +6376,21 @@ static int __net_init ip6_route_net_init | ||
ip6_template_metrics, true); | ||
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); | ||
|
||
|
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; | ||
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, | ||
ip6_template_metrics, true); | ||
@@ -6370,6 +6416,8 @@ out: | ||
@@ -6371,6 +6417,8 @@ out: | ||
return ret; | ||
|
||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
|
@@ -243,15 +243,15 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
out_ip6_prohibit_entry: | ||
kfree(net->ipv6.ip6_prohibit_entry); | ||
out_ip6_null_entry: | ||
@@ -6389,6 +6437,7 @@ static void __net_exit ip6_route_net_exi | ||
@@ -6390,6 +6438,7 @@ static void __net_exit ip6_route_net_exi | ||
kfree(net->ipv6.ip6_null_entry); | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
kfree(net->ipv6.ip6_prohibit_entry); | ||
+ kfree(net->ipv6.ip6_policy_failed_entry); | ||
kfree(net->ipv6.ip6_blk_hole_entry); | ||
#endif | ||
dst_entries_destroy(&net->ipv6.ip6_dst_ops); | ||
@@ -6466,6 +6515,9 @@ void __init ip6_route_init_special_entri | ||
@@ -6467,6 +6516,9 @@ void __init ip6_route_init_special_entri | ||
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); | ||
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; | ||
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); | ||
|