-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.34 Removed upstreamed: backport-6.6/701-v6.8-net-sfp-bus-fix-SFP-mode-detect-from-bitrate.patch[1] All other patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.34&id=9399baa02e4b7f101c39fdbc4d681d54bca4465b Signed-off-by: John Audia <[email protected]>
- Loading branch information
1 parent
e6e4d90
commit a09a72d
Showing
10 changed files
with
26 additions
and
72 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-6.6 = .33 | ||
LINUX_KERNEL_HASH-6.6.33 = a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 | ||
LINUX_VERSION-6.6 = .34 | ||
LINUX_KERNEL_HASH-6.6.34 = c4e0ec8f593aa3717e85abad940466e7d7cbc362989426eb37f499330a461ba0 |
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 |
---|---|---|
|
@@ -50,7 +50,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
if (!mmc_op_tuning(host->cmd->opcode)) | ||
--- a/drivers/mmc/host/sdhci.h | ||
+++ b/drivers/mmc/host/sdhci.h | ||
@@ -491,6 +491,9 @@ struct sdhci_host { | ||
@@ -492,6 +492,9 @@ struct sdhci_host { | ||
#define SDHCI_QUIRK2_NO_SDR50 (1<<20) | ||
#define SDHCI_QUIRK2_NO_SDR104 (1<<21) | ||
|
||
|
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 |
---|---|---|
|
@@ -24,7 +24,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
BUG_ON(data->blksz > host->mmc->max_blk_size); | ||
BUG_ON(data->blocks > 65535); | ||
|
||
@@ -4718,11 +4718,16 @@ int sdhci_setup_host(struct sdhci_host * | ||
@@ -4724,11 +4724,16 @@ int sdhci_setup_host(struct sdhci_host * | ||
spin_lock_init(&host->lock); | ||
|
||
/* | ||
|
46 changes: 0 additions & 46 deletions
46
...et/linux/generic/backport-6.6/701-v6.8-net-sfp-bus-fix-SFP-mode-detect-from-bitrate.patch
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (!pe) | ||
--- a/mm/vmalloc.c | ||
+++ b/mm/vmalloc.c | ||
@@ -4439,6 +4439,8 @@ static const struct seq_operations vmall | ||
@@ -4438,6 +4438,8 @@ static const struct seq_operations vmall | ||
|
||
static int __init proc_vmalloc_init(void) | ||
{ | ||
|
@@ -396,7 +396,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
--- a/net/ipv4/route.c | ||
+++ b/net/ipv4/route.c | ||
@@ -380,6 +380,9 @@ static struct pernet_operations ip_rt_pr | ||
@@ -381,6 +381,9 @@ static struct pernet_operations ip_rt_pr | ||
|
||
static int __init ip_rt_proc_init(void) | ||
{ | ||
|
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 |
---|---|---|
|
@@ -110,7 +110,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
return -EINVAL; | ||
--- a/net/ipv6/route.c | ||
+++ b/net/ipv6/route.c | ||
@@ -97,6 +97,8 @@ static int ip6_pkt_discard(struct sk_bu | ||
@@ -98,6 +98,8 @@ static int ip6_pkt_discard(struct sk_bu | ||
static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb); | ||
static int ip6_pkt_prohibit(struct sk_buff *skb); | ||
static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb); | ||
|
@@ -119,7 +119,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
static void ip6_link_failure(struct sk_buff *skb); | ||
static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, | ||
struct sk_buff *skb, u32 mtu, | ||
@@ -317,6 +319,18 @@ static const struct rt6_info ip6_prohibi | ||
@@ -318,6 +320,18 @@ static const struct rt6_info ip6_prohibi | ||
.rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP), | ||
}; | ||
|
||
|
@@ -138,15 +138,15 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
static const struct rt6_info ip6_blk_hole_entry_template = { | ||
.dst = { | ||
.__rcuref = RCUREF_INIT(1), | ||
@@ -1037,6 +1051,7 @@ static const int fib6_prop[RTN_MAX + 1] | ||
@@ -1038,6 +1052,7 @@ static const int fib6_prop[RTN_MAX + 1] | ||
[RTN_BLACKHOLE] = -EINVAL, | ||
[RTN_UNREACHABLE] = -EHOSTUNREACH, | ||
[RTN_PROHIBIT] = -EACCES, | ||
+ [RTN_POLICY_FAILED] = -EACCES, | ||
[RTN_THROW] = -EAGAIN, | ||
[RTN_NAT] = -EINVAL, | ||
[RTN_XRESOLVE] = -EINVAL, | ||
@@ -1072,6 +1087,10 @@ static void ip6_rt_init_dst_reject(struc | ||
@@ -1073,6 +1088,10 @@ static void ip6_rt_init_dst_reject(struc | ||
rt->dst.output = ip6_pkt_prohibit_out; | ||
rt->dst.input = ip6_pkt_prohibit; | ||
break; | ||
|
@@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
case RTN_THROW: | ||
case RTN_UNREACHABLE: | ||
default: | ||
@@ -4539,6 +4558,17 @@ static int ip6_pkt_prohibit_out(struct n | ||
@@ -4543,6 +4562,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. | ||
*/ | ||
@@ -5030,7 +5060,8 @@ static int rtm_to_fib6_config(struct sk_ | ||
@@ -5034,7 +5064,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) | ||
@@ -6277,6 +6308,8 @@ static int ip6_route_dev_notify(struct n | ||
@@ -6281,6 +6312,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 | ||
@@ -6288,6 +6321,7 @@ static int ip6_route_dev_notify(struct n | ||
@@ -6292,6 +6325,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 | ||
} | ||
@@ -6488,6 +6522,8 @@ static int __net_init ip6_route_net_init | ||
@@ -6492,6 +6526,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); | ||
@@ -6498,11 +6534,21 @@ static int __net_init ip6_route_net_init | ||
@@ -6502,11 +6538,21 @@ static int __net_init ip6_route_net_init | ||
ip6_template_metrics, true); | ||
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->dst.rt_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); | ||
@@ -6529,6 +6575,8 @@ out: | ||
@@ -6533,6 +6579,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: | ||
@@ -6548,6 +6596,7 @@ static void __net_exit ip6_route_net_exi | ||
@@ -6552,6 +6600,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); | ||
@@ -6631,6 +6680,9 @@ void __init ip6_route_init_special_entri | ||
@@ -6635,6 +6684,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); | ||
|
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 |
---|---|---|
|
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]> | |
help | ||
--- a/init/main.c | ||
+++ b/init/main.c | ||
@@ -609,6 +609,29 @@ static inline void setup_nr_cpu_ids(void | ||
@@ -608,6 +608,29 @@ static inline void setup_nr_cpu_ids(void | ||
static inline void smp_prepare_cpus(unsigned int maxcpus) { } | ||
#endif | ||
|
||
|
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <[email protected]> | |
/* | ||
* We need to store the untouched command line for future reference. | ||
* We also need to store the touched command line since the parameter | ||
@@ -898,6 +921,7 @@ void start_kernel(void) | ||
@@ -897,6 +920,7 @@ void start_kernel(void) | ||
pr_notice("%s", linux_banner); | ||
early_security_init(); | ||
setup_arch(&command_line); | ||
|
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 |
---|---|---|
|
@@ -177,7 +177,7 @@ Signed-off-by: Christian Marangi <[email protected]> | |
#include <linux/bootconfig.h> | ||
#include <linux/console.h> | ||
#include <linux/nmi.h> | ||
@@ -932,6 +933,17 @@ void start_kernel(void) | ||
@@ -931,6 +932,17 @@ void start_kernel(void) | ||
pr_notice("Kernel command line: %s\n", saved_command_line); | ||
/* parameters may set static keys */ | ||
jump_label_init(); | ||
|
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 |
---|---|---|
|
@@ -258,7 +258,7 @@ Signed-off-by: Michael Gray <[email protected]> | |
static int kernel_init(void *); | ||
|
||
/* | ||
@@ -930,6 +934,18 @@ void start_kernel(void) | ||
@@ -929,6 +933,18 @@ void start_kernel(void) | ||
boot_cpu_hotplug_init(); | ||
|
||
pr_notice("Kernel command line: %s\n", saved_command_line); | ||
|