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.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: aliyundrive-webdav: update to 1.1.1 (coolsnowwolf#8679) kernel: bump 5.10 to 5.10.91 (coolsnowwolf#8678)
- Loading branch information
Showing
6 changed files
with
13 additions
and
13 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
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
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 |
|---|---|---|
|
|
@@ -55,7 +55,7 @@ Signed-off-by: Mateusz Kwiatkowski <[email protected]> | |
| reg = <0x7e807000 0x100>; | ||
| --- a/arch/arm/boot/dts/bcm283x.dtsi | ||
| +++ b/arch/arm/boot/dts/bcm283x.dtsi | ||
| @@ -488,14 +488,6 @@ | ||
| @@ -490,14 +490,6 @@ | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
| status = "disabled"; | ||
| }; | ||
|
|
||
| @@ -1112,7 +1112,3 @@ | ||
| @@ -1114,7 +1114,3 @@ | ||
| &usb { | ||
| interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; | ||
| }; | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
| cfg->fc_flags |= RTF_REJECT; | ||
|
|
||
| if (rtm->rtm_type == RTN_LOCAL) | ||
| @@ -6099,6 +6130,8 @@ static int ip6_route_dev_notify(struct n | ||
| @@ -6127,6 +6158,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 | ||
| @@ -6110,6 +6143,7 @@ static int ip6_route_dev_notify(struct n | ||
| @@ -6138,6 +6171,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 | ||
| } | ||
| @@ -6301,6 +6335,8 @@ static int __net_init ip6_route_net_init | ||
| @@ -6329,6 +6363,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); | ||
| @@ -6311,11 +6347,21 @@ static int __net_init ip6_route_net_init | ||
| @@ -6339,11 +6375,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); | ||
| @@ -6342,6 +6388,8 @@ out: | ||
| @@ -6370,6 +6416,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: | ||
| @@ -6361,6 +6409,7 @@ static void __net_exit ip6_route_net_exi | ||
| @@ -6389,6 +6437,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); | ||
| @@ -6438,6 +6487,9 @@ void __init ip6_route_init_special_entri | ||
| @@ -6466,6 +6515,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); | ||
|
|
||