mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 6.6 to 6.6.37 (#12313)
This commit is contained in:
parent
6b275d3f2f
commit
f3887ab8b7
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.6 = .36
|
LINUX_VERSION-6.6 = .37
|
||||||
LINUX_KERNEL_HASH-6.6.36 = b9676828b737e8fb8eaa5198303d35d35e8df019550be153c8a42c99afe0cdd5
|
LINUX_KERNEL_HASH-6.6.37 = f3976e77708694fe4a1f8d1307c315c8a36cbc58f038a38e006b91e29a1f3214
|
||||||
|
@ -55,7 +55,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
|||||||
#define PHY_PMA_MGBT_POLARITY 0x82
|
#define PHY_PMA_MGBT_POLARITY 0x82
|
||||||
#define PHY_MDI_MDI_X_MASK GENMASK(1, 0)
|
#define PHY_MDI_MDI_X_MASK GENMASK(1, 0)
|
||||||
#define PHY_MDI_MDI_X_NORMAL 0x3
|
#define PHY_MDI_MDI_X_NORMAL 0x3
|
||||||
@@ -270,6 +277,35 @@ out:
|
@@ -270,10 +277,39 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -91,3 +91,8 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
|||||||
static int gpy_config_init(struct phy_device *phydev)
|
static int gpy_config_init(struct phy_device *phydev)
|
||||||
{
|
{
|
||||||
/* Nothing to configure. Configuration Requirement Placeholder */
|
/* Nothing to configure. Configuration Requirement Placeholder */
|
||||||
|
- return 0;
|
||||||
|
+ return gpy_led_write(phydev);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int gpy_probe(struct phy_device *phydev)
|
||||||
|
@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (!pe)
|
if (!pe)
|
||||||
--- a/mm/vmalloc.c
|
--- a/mm/vmalloc.c
|
||||||
+++ b/mm/vmalloc.c
|
+++ b/mm/vmalloc.c
|
||||||
@@ -4438,6 +4438,8 @@ static const struct seq_operations vmall
|
@@ -4447,6 +4447,8 @@ static const struct seq_operations vmall
|
||||||
|
|
||||||
static int __init proc_vmalloc_init(void)
|
static int __init proc_vmalloc_init(void)
|
||||||
{
|
{
|
||||||
|
@ -88,7 +88,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
|
|||||||
genl_info_net_set(&info, net);
|
genl_info_net_set(&info, net);
|
||||||
--- a/net/openvswitch/conntrack.c
|
--- a/net/openvswitch/conntrack.c
|
||||||
+++ b/net/openvswitch/conntrack.c
|
+++ b/net/openvswitch/conntrack.c
|
||||||
@@ -1606,7 +1606,7 @@ static struct sk_buff *
|
@@ -1611,7 +1611,7 @@ static struct sk_buff *
|
||||||
ovs_ct_limit_cmd_reply_start(struct genl_info *info, u8 cmd,
|
ovs_ct_limit_cmd_reply_start(struct genl_info *info, u8 cmd,
|
||||||
struct ovs_header **ovs_reply_header)
|
struct ovs_header **ovs_reply_header)
|
||||||
{
|
{
|
||||||
|
@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/net/netfilter/nf_tables_api.c
|
--- a/net/netfilter/nf_tables_api.c
|
||||||
+++ b/net/netfilter/nf_tables_api.c
|
+++ b/net/netfilter/nf_tables_api.c
|
||||||
@@ -8268,7 +8268,7 @@ static int nft_register_flowtable_net_ho
|
@@ -8267,7 +8267,7 @@ static int nft_register_flowtable_net_ho
|
||||||
err = flowtable->data.type->setup(&flowtable->data,
|
err = flowtable->data.type->setup(&flowtable->data,
|
||||||
hook->ops.dev,
|
hook->ops.dev,
|
||||||
FLOW_BLOCK_BIND);
|
FLOW_BLOCK_BIND);
|
||||||
|
@ -83,20 +83,20 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||||||
ata_sff_port_init(ap);
|
ata_sff_port_init(ap);
|
||||||
|
|
||||||
return ap;
|
return ap;
|
||||||
@@ -5530,6 +5547,12 @@ static void ata_host_release(struct kref
|
@@ -5507,6 +5524,12 @@ void ata_port_free(struct ata_port *ap)
|
||||||
kfree(ap->pmp_link);
|
kfree(ap->pmp_link);
|
||||||
kfree(ap->slave_link);
|
kfree(ap->slave_link);
|
||||||
kfree(ap->ncq_sense_buf);
|
kfree(ap->ncq_sense_buf);
|
||||||
+#ifdef CONFIG_ATA_LEDS
|
+#ifdef CONFIG_ATA_LEDS
|
||||||
+ if (ap->ledtrig) {
|
+ if (ap->ledtrig) {
|
||||||
+ led_trigger_unregister(ap->ledtrig);
|
+ led_trigger_unregister(ap->ledtrig);
|
||||||
+ kfree(ap->ledtrig);
|
+ kfree(ap->ledtrig);
|
||||||
+ };
|
+ };
|
||||||
+#endif
|
+#endif
|
||||||
kfree(ap);
|
kfree(ap);
|
||||||
host->ports[i] = NULL;
|
}
|
||||||
}
|
EXPORT_SYMBOL_GPL(ata_port_free);
|
||||||
@@ -5920,7 +5943,23 @@ int ata_host_register(struct ata_host *h
|
@@ -5927,7 +5950,23 @@ int ata_host_register(struct ata_host *h
|
||||||
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
||||||
host->ports[i]->local_port_no = i + 1;
|
host->ports[i]->local_port_no = i + 1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user