diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 3036dc4b3..3e891b523 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -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 diff --git a/target/linux/generic/hack-6.6/410-block-fit-partition-parser.patch b/target/linux/generic/hack-6.6/410-block-fit-partition-parser.patch index 1fe63454e..8783bd7c7 100644 --- a/target/linux/generic/hack-6.6/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-6.6/410-block-fit-partition-parser.patch @@ -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); diff --git a/target/linux/generic/hack-6.6/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-6.6/661-use_fq_codel_by_default.patch index 8ab4199f3..37afc2cc3 100644 --- a/target/linux/generic/hack-6.6/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-6.6/661-use_fq_codel_by_default.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- 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; diff --git a/target/linux/generic/hack-6.6/902-debloat_proc.patch b/target/linux/generic/hack-6.6/902-debloat_proc.patch index d3bf39091..2f6b44996 100644 --- a/target/linux/generic/hack-6.6/902-debloat_proc.patch +++ b/target/linux/generic/hack-6.6/902-debloat_proc.patch @@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau --- 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) { diff --git a/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch b/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch index 25a6f742c..117a1a281 100644 --- a/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch +++ b/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch @@ -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) { diff --git a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch index 1cfc4b7ca..e0174ef6c 100644 --- a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch +++ b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau --- 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); diff --git a/target/linux/generic/pending-6.6/790-bus-mhi-core-add-SBL-state-callback.patch b/target/linux/generic/pending-6.6/790-bus-mhi-core-add-SBL-state-callback.patch index 874df43e7..f23935559 100644 --- a/target/linux/generic/pending-6.6/790-bus-mhi-core-add-SBL-state-callback.patch +++ b/target/linux/generic/pending-6.6/790-bus-mhi-core-add-SBL-state-callback.patch @@ -20,7 +20,7 @@ Signed-off-by: Robert Marko --- 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;