mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 6.6 to 6.6.15 (#11857)
This commit is contained in:
parent
e3811adc69
commit
458735dec7
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.6 = .14
|
||||
LINUX_KERNEL_HASH-6.6.14 = fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584
|
||||
LINUX_VERSION-6.6 = .15
|
||||
LINUX_KERNEL_HASH-6.6.15 = ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa
|
||||
|
@ -86,7 +86,7 @@
|
||||
/* everything is up and running, commence */
|
||||
err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
|
||||
if (err)
|
||||
@@ -579,6 +591,11 @@ static bool blk_add_partition(struct gen
|
||||
@@ -584,6 +596,11 @@ static bool blk_add_partition(struct gen
|
||||
(state->parts[p].flags & ADDPART_FLAG_RAID))
|
||||
md_autodetect_dev(part->bd_dev);
|
||||
|
||||
|
@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/include/net/sch_generic.h
|
||||
+++ b/include/net/sch_generic.h
|
||||
@@ -589,12 +589,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
|
||||
@@ -593,12 +593,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
|
||||
extern struct Qdisc_ops pfifo_fast_ops;
|
||||
extern struct Qdisc_ops mq_qdisc_ops;
|
||||
extern struct Qdisc_ops noqueue_qdisc_ops;
|
||||
|
@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/core/sock.c
|
||||
+++ b/net/core/sock.c
|
||||
@@ -4124,6 +4124,8 @@ static __net_initdata struct pernet_oper
|
||||
@@ -4125,6 +4125,8 @@ static __net_initdata struct pernet_oper
|
||||
|
||||
static int __init proto_init(void)
|
||||
{
|
||||
|
@ -44,7 +44,7 @@
|
||||
#endif /* _LINUX_U64_STATS_SYNC_H */
|
||||
--- a/drivers/thermal/thermal_core.c
|
||||
+++ b/drivers/thermal/thermal_core.c
|
||||
@@ -1270,7 +1270,7 @@ thermal_zone_device_register_with_trips(
|
||||
@@ -1275,7 +1275,7 @@ thermal_zone_device_register_with_trips(
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
if (!thermal_class)
|
||||
@@ -1392,6 +1392,17 @@ free_tz:
|
||||
@@ -1397,6 +1397,17 @@ free_tz:
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);
|
||||
|
||||
@ -73,7 +73,7 @@
|
||||
void *devdata,
|
||||
--- a/drivers/thermal/thermal_trip.c
|
||||
+++ b/drivers/thermal/thermal_trip.c
|
||||
@@ -116,11 +116,29 @@ void __thermal_zone_set_trips(struct the
|
||||
@@ -113,11 +113,29 @@ void __thermal_zone_set_trips(struct the
|
||||
int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
|
||||
struct thermal_trip *trip)
|
||||
{
|
||||
|
@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -8202,7 +8202,7 @@ static int nft_register_flowtable_net_ho
|
||||
@@ -8206,7 +8206,7 @@ static int nft_register_flowtable_net_ho
|
||||
err = flowtable->data.type->setup(&flowtable->data,
|
||||
hook->ops.dev,
|
||||
FLOW_BLOCK_BIND);
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
|
||||
--- a/drivers/bus/mhi/host/main.c
|
||||
+++ b/drivers/bus/mhi/host/main.c
|
||||
@@ -900,6 +900,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_
|
||||
@@ -905,6 +905,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_
|
||||
switch (event) {
|
||||
case MHI_EE_SBL:
|
||||
st = DEV_ST_TRANSITION_SBL;
|
||||
|
Loading…
Reference in New Issue
Block a user