From f1c538a855429cb72645c83e2c6acf01729d75a0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 17 Feb 2026 10:09:28 +0100 Subject: [PATCH] move the queues back in place --- ...en-change-fw-message-timeout-warning.patch | 0 ...onfig_detect_hung_task-specific-code.patch | 0 ...e-after-free-in-driver_override_show.patch | 0 ...h-sysfs_emit-in-sysfs-show-functions.patch | 0 ...xxx-fix-bsg_done-causing-double-free.patch | 0 {temp/queue-6.12 => queue-6.12}/series | 1 - ...st-device-fix-broken-intra-doc-links.patch | 0 .../rust-dma-fix-broken-intra-doc-links.patch | 0 ...ra-doc-links-to-example-driver-types.patch | 0 ...xxx-fix-bsg_done-causing-double-free.patch | 0 {temp/queue-6.18 => queue-6.18}/series | 1 - ...xxx-fix-bsg_done-causing-double-free.patch | 0 queue-6.19/series | 1 + ...e-after-free-in-driver_override_show.patch | 0 ...h-sysfs_emit-in-sysfs-show-functions.patch | 0 ...d-creating-sub-groups-asynchronously.patch | 0 ...unused-field-in-struct-pci_epf_group.patch | 0 ...-device_lock-for-driver_match_device.patch | 72 ------------------- ...xxx-fix-bsg_done-causing-double-free.patch | 0 queue-6.6/series | 6 +- ...-device_lock-for-driver_match_device.patch | 72 ------------------- ...-device_lock-for-driver_match_device.patch | 72 ------------------- ...-device_lock-for-driver_match_device.patch | 72 ------------------- temp/queue-6.19/series | 2 - ...-device_lock-for-driver_match_device.patch | 72 ------------------- temp/queue-6.6/series | 6 -- 26 files changed, 6 insertions(+), 371 deletions(-) rename {temp/queue-6.12 => queue-6.12}/bnxt_en-change-fw-message-timeout-warning.patch (100%) rename {temp/queue-6.12 => queue-6.12}/bnxt_en-hide-config_detect_hung_task-specific-code.patch (100%) rename {temp/queue-6.12 => queue-6.12}/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch (100%) rename {temp/queue-6.12 => queue-6.12}/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch (100%) rename {temp/queue-6.12 => queue-6.12}/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch (100%) rename {temp/queue-6.12 => queue-6.12}/series (81%) rename {temp/queue-6.18 => queue-6.18}/rust-device-fix-broken-intra-doc-links.patch (100%) rename {temp/queue-6.18 => queue-6.18}/rust-dma-fix-broken-intra-doc-links.patch (100%) rename {temp/queue-6.18 => queue-6.18}/rust-driver-fix-broken-intra-doc-links-to-example-driver-types.patch (100%) rename {temp/queue-6.18 => queue-6.18}/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch (100%) rename {temp/queue-6.18 => queue-6.18}/series (75%) rename {temp/queue-6.19 => queue-6.19}/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch (100%) create mode 100644 queue-6.19/series rename {temp/queue-6.6 => queue-6.6}/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch (100%) rename {temp/queue-6.6 => queue-6.6}/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch (100%) rename {temp/queue-6.6 => queue-6.6}/pci-endpoint-avoid-creating-sub-groups-asynchronously.patch (100%) rename {temp/queue-6.6 => queue-6.6}/pci-endpoint-remove-unused-field-in-struct-pci_epf_group.patch (100%) delete mode 100644 queue-6.6/revert-driver-core-enforce-device_lock-for-driver_match_device.patch rename {temp/queue-6.6 => queue-6.6}/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch (100%) delete mode 100644 temp/queue-6.12/revert-driver-core-enforce-device_lock-for-driver_match_device.patch delete mode 100644 temp/queue-6.18/revert-driver-core-enforce-device_lock-for-driver_match_device.patch delete mode 100644 temp/queue-6.19/revert-driver-core-enforce-device_lock-for-driver_match_device.patch delete mode 100644 temp/queue-6.19/series delete mode 100644 temp/queue-6.6/revert-driver-core-enforce-device_lock-for-driver_match_device.patch delete mode 100644 temp/queue-6.6/series diff --git a/temp/queue-6.12/bnxt_en-change-fw-message-timeout-warning.patch b/queue-6.12/bnxt_en-change-fw-message-timeout-warning.patch similarity index 100% rename from temp/queue-6.12/bnxt_en-change-fw-message-timeout-warning.patch rename to queue-6.12/bnxt_en-change-fw-message-timeout-warning.patch diff --git a/temp/queue-6.12/bnxt_en-hide-config_detect_hung_task-specific-code.patch b/queue-6.12/bnxt_en-hide-config_detect_hung_task-specific-code.patch similarity index 100% rename from temp/queue-6.12/bnxt_en-hide-config_detect_hung_task-specific-code.patch rename to queue-6.12/bnxt_en-hide-config_detect_hung_task-specific-code.patch diff --git a/temp/queue-6.12/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch b/queue-6.12/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch similarity index 100% rename from temp/queue-6.12/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch rename to queue-6.12/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch diff --git a/temp/queue-6.12/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch b/queue-6.12/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch similarity index 100% rename from temp/queue-6.12/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch rename to queue-6.12/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch diff --git a/temp/queue-6.12/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch b/queue-6.12/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch similarity index 100% rename from temp/queue-6.12/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch rename to queue-6.12/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch diff --git a/temp/queue-6.12/series b/queue-6.12/series similarity index 81% rename from temp/queue-6.12/series rename to queue-6.12/series index ce3ae5389d..2fbca806bc 100644 --- a/temp/queue-6.12/series +++ b/queue-6.12/series @@ -3,4 +3,3 @@ bnxt_en-change-fw-message-timeout-warning.patch bnxt_en-hide-config_detect_hung_task-specific-code.patch bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch -revert-driver-core-enforce-device_lock-for-driver_match_device.patch diff --git a/temp/queue-6.18/rust-device-fix-broken-intra-doc-links.patch b/queue-6.18/rust-device-fix-broken-intra-doc-links.patch similarity index 100% rename from temp/queue-6.18/rust-device-fix-broken-intra-doc-links.patch rename to queue-6.18/rust-device-fix-broken-intra-doc-links.patch diff --git a/temp/queue-6.18/rust-dma-fix-broken-intra-doc-links.patch b/queue-6.18/rust-dma-fix-broken-intra-doc-links.patch similarity index 100% rename from temp/queue-6.18/rust-dma-fix-broken-intra-doc-links.patch rename to queue-6.18/rust-dma-fix-broken-intra-doc-links.patch diff --git a/temp/queue-6.18/rust-driver-fix-broken-intra-doc-links-to-example-driver-types.patch b/queue-6.18/rust-driver-fix-broken-intra-doc-links-to-example-driver-types.patch similarity index 100% rename from temp/queue-6.18/rust-driver-fix-broken-intra-doc-links-to-example-driver-types.patch rename to queue-6.18/rust-driver-fix-broken-intra-doc-links-to-example-driver-types.patch diff --git a/temp/queue-6.18/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch b/queue-6.18/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch similarity index 100% rename from temp/queue-6.18/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch rename to queue-6.18/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch diff --git a/temp/queue-6.18/series b/queue-6.18/series similarity index 75% rename from temp/queue-6.18/series rename to queue-6.18/series index 2c048b5056..1c2c0df05a 100644 --- a/temp/queue-6.18/series +++ b/queue-6.18/series @@ -2,4 +2,3 @@ scsi-qla2xxx-fix-bsg_done-causing-double-free.patch rust-device-fix-broken-intra-doc-links.patch rust-dma-fix-broken-intra-doc-links.patch rust-driver-fix-broken-intra-doc-links-to-example-driver-types.patch -revert-driver-core-enforce-device_lock-for-driver_match_device.patch diff --git a/temp/queue-6.19/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch b/queue-6.19/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch similarity index 100% rename from temp/queue-6.19/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch rename to queue-6.19/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch diff --git a/queue-6.19/series b/queue-6.19/series new file mode 100644 index 0000000000..40eb4524d6 --- /dev/null +++ b/queue-6.19/series @@ -0,0 +1 @@ +scsi-qla2xxx-fix-bsg_done-causing-double-free.patch diff --git a/temp/queue-6.6/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch b/queue-6.6/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch similarity index 100% rename from temp/queue-6.6/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch rename to queue-6.6/bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch diff --git a/temp/queue-6.6/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch b/queue-6.6/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch similarity index 100% rename from temp/queue-6.6/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch rename to queue-6.6/bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch diff --git a/temp/queue-6.6/pci-endpoint-avoid-creating-sub-groups-asynchronously.patch b/queue-6.6/pci-endpoint-avoid-creating-sub-groups-asynchronously.patch similarity index 100% rename from temp/queue-6.6/pci-endpoint-avoid-creating-sub-groups-asynchronously.patch rename to queue-6.6/pci-endpoint-avoid-creating-sub-groups-asynchronously.patch diff --git a/temp/queue-6.6/pci-endpoint-remove-unused-field-in-struct-pci_epf_group.patch b/queue-6.6/pci-endpoint-remove-unused-field-in-struct-pci_epf_group.patch similarity index 100% rename from temp/queue-6.6/pci-endpoint-remove-unused-field-in-struct-pci_epf_group.patch rename to queue-6.6/pci-endpoint-remove-unused-field-in-struct-pci_epf_group.patch diff --git a/queue-6.6/revert-driver-core-enforce-device_lock-for-driver_match_device.patch b/queue-6.6/revert-driver-core-enforce-device_lock-for-driver_match_device.patch deleted file mode 100644 index 6a1277cb74..0000000000 --- a/queue-6.6/revert-driver-core-enforce-device_lock-for-driver_match_device.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8819cb8faec938fa3e3b0023e1839ee52d3af32 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Mon, 16 Feb 2026 16:41:21 +0100 -Subject: Revert "driver core: enforce device_lock for driver_match_device()" - -From: Greg Kroah-Hartman - -This reverts commit adc1796eced46b48e23ec200a219d635f33a38ee which is -commit dc23806a7c47ec5f1293aba407fb69519f976ee0 upstream. - -It causes boot regressions on some systems as all of the "fixes" for -drivers are not properly backported yet. Once that is completed, only -then can this be applied, if really necessary given the potential for -explosions, perhaps we might want to wait a few -rc releases first... - -Cc: Danilo Krummrich -Cc: Rafael J. Wysocki (Intel) -Cc: Danilo Krummrich -Cc: Gui-Dong Han -Cc: Qiu-ji Chen -Reported-by: Mark Brown -Link: https://lore.kernel.org/r/7dfd0e63-a725-4fac-b2a0-f2e621d99d1b@sirena.org.uk -Signed-off-by: Greg Kroah-Hartman ---- - drivers/base/base.h | 9 --------- - drivers/base/bus.c | 2 +- - drivers/base/dd.c | 2 +- - 3 files changed, 2 insertions(+), 11 deletions(-) - ---- a/drivers/base/base.h -+++ b/drivers/base/base.h -@@ -165,18 +165,9 @@ void device_set_deferred_probe_reason(co - static inline int driver_match_device(struct device_driver *drv, - struct device *dev) - { -- device_lock_assert(dev); -- - return drv->bus->match ? drv->bus->match(dev, drv) : 1; - } - --static inline int driver_match_device_locked(struct device_driver *drv, -- struct device *dev) --{ -- guard(device)(dev); -- return driver_match_device(drv, dev); --} -- - static inline void dev_sync_state(struct device *dev) - { - if (dev->bus->sync_state) ---- a/drivers/base/bus.c -+++ b/drivers/base/bus.c -@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_ - int err = -ENODEV; - - dev = bus_find_device_by_name(bus, NULL, buf); -- if (dev && driver_match_device_locked(drv, dev)) { -+ if (dev && driver_match_device(drv, dev)) { - err = device_driver_attach(drv, dev); - if (!err) { - /* success */ ---- a/drivers/base/dd.c -+++ b/drivers/base/dd.c -@@ -1169,7 +1169,7 @@ static int __driver_attach(struct device - * is an error. - */ - -- ret = driver_match_device_locked(drv, dev); -+ ret = driver_match_device(drv, dev); - if (ret == 0) { - /* no match */ - return 0; diff --git a/temp/queue-6.6/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch b/queue-6.6/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch similarity index 100% rename from temp/queue-6.6/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch rename to queue-6.6/scsi-qla2xxx-fix-bsg_done-causing-double-free.patch diff --git a/queue-6.6/series b/queue-6.6/series index 838738dbd1..40aa01ad23 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -1 +1,5 @@ -revert-driver-core-enforce-device_lock-for-driver_match_device.patch +scsi-qla2xxx-fix-bsg_done-causing-double-free.patch +pci-endpoint-remove-unused-field-in-struct-pci_epf_group.patch +pci-endpoint-avoid-creating-sub-groups-asynchronously.patch +bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch +bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch diff --git a/temp/queue-6.12/revert-driver-core-enforce-device_lock-for-driver_match_device.patch b/temp/queue-6.12/revert-driver-core-enforce-device_lock-for-driver_match_device.patch deleted file mode 100644 index 52231d91ac..0000000000 --- a/temp/queue-6.12/revert-driver-core-enforce-device_lock-for-driver_match_device.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8819cb8faec938fa3e3b0023e1839ee52d3af32 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Mon, 16 Feb 2026 16:41:21 +0100 -Subject: Revert "driver core: enforce device_lock for driver_match_device()" - -From: Greg Kroah-Hartman - -This reverts commit cd0e0a76e40c2e77bcfc88291d00dca22b00158e which is -commit dc23806a7c47ec5f1293aba407fb69519f976ee0 upstream. - -It causes boot regressions on some systems as all of the "fixes" for -drivers are not properly backported yet. Once that is completed, only -then can this be applied, if really necessary given the potential for -explosions, perhaps we might want to wait a few -rc releases first... - -Cc: Danilo Krummrich -Cc: Rafael J. Wysocki (Intel) -Cc: Danilo Krummrich -Cc: Gui-Dong Han -Cc: Qiu-ji Chen -Reported-by: Mark Brown -Link: https://lore.kernel.org/r/7dfd0e63-a725-4fac-b2a0-f2e621d99d1b@sirena.org.uk -Signed-off-by: Greg Kroah-Hartman ---- - drivers/base/base.h | 9 --------- - drivers/base/bus.c | 2 +- - drivers/base/dd.c | 2 +- - 3 files changed, 2 insertions(+), 11 deletions(-) - ---- a/drivers/base/base.h -+++ b/drivers/base/base.h -@@ -165,18 +165,9 @@ void device_set_deferred_probe_reason(co - static inline int driver_match_device(const struct device_driver *drv, - struct device *dev) - { -- device_lock_assert(dev); -- - return drv->bus->match ? drv->bus->match(dev, drv) : 1; - } - --static inline int driver_match_device_locked(const struct device_driver *drv, -- struct device *dev) --{ -- guard(device)(dev); -- return driver_match_device(drv, dev); --} -- - static inline void dev_sync_state(struct device *dev) - { - if (dev->bus->sync_state) ---- a/drivers/base/bus.c -+++ b/drivers/base/bus.c -@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_ - int err = -ENODEV; - - dev = bus_find_device_by_name(bus, NULL, buf); -- if (dev && driver_match_device_locked(drv, dev)) { -+ if (dev && driver_match_device(drv, dev)) { - err = device_driver_attach(drv, dev); - if (!err) { - /* success */ ---- a/drivers/base/dd.c -+++ b/drivers/base/dd.c -@@ -1168,7 +1168,7 @@ static int __driver_attach(struct device - * is an error. - */ - -- ret = driver_match_device_locked(drv, dev); -+ ret = driver_match_device(drv, dev); - if (ret == 0) { - /* no match */ - return 0; diff --git a/temp/queue-6.18/revert-driver-core-enforce-device_lock-for-driver_match_device.patch b/temp/queue-6.18/revert-driver-core-enforce-device_lock-for-driver_match_device.patch deleted file mode 100644 index aa44e258f9..0000000000 --- a/temp/queue-6.18/revert-driver-core-enforce-device_lock-for-driver_match_device.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8819cb8faec938fa3e3b0023e1839ee52d3af32 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Mon, 16 Feb 2026 16:41:21 +0100 -Subject: Revert "driver core: enforce device_lock for driver_match_device()" - -From: Greg Kroah-Hartman - -This reverts commit 8d76b2488eb3cc0717ab81b60622cff4a5f90f79 which is -commit dc23806a7c47ec5f1293aba407fb69519f976ee0 upstream. - -It causes boot regressions on some systems as all of the "fixes" for -drivers are not properly backported yet. Once that is completed, only -then can this be applied, if really necessary given the potential for -explosions, perhaps we might want to wait a few -rc releases first... - -Cc: Danilo Krummrich -Cc: Rafael J. Wysocki (Intel) -Cc: Danilo Krummrich -Cc: Gui-Dong Han -Cc: Qiu-ji Chen -Reported-by: Mark Brown -Link: https://lore.kernel.org/r/7dfd0e63-a725-4fac-b2a0-f2e621d99d1b@sirena.org.uk -Signed-off-by: Greg Kroah-Hartman ---- - drivers/base/base.h | 9 --------- - drivers/base/bus.c | 2 +- - drivers/base/dd.c | 2 +- - 3 files changed, 2 insertions(+), 11 deletions(-) - ---- a/drivers/base/base.h -+++ b/drivers/base/base.h -@@ -166,18 +166,9 @@ void device_set_deferred_probe_reason(co - static inline int driver_match_device(const struct device_driver *drv, - struct device *dev) - { -- device_lock_assert(dev); -- - return drv->bus->match ? drv->bus->match(dev, drv) : 1; - } - --static inline int driver_match_device_locked(const struct device_driver *drv, -- struct device *dev) --{ -- guard(device)(dev); -- return driver_match_device(drv, dev); --} -- - static inline void dev_sync_state(struct device *dev) - { - if (dev->bus->sync_state) ---- a/drivers/base/bus.c -+++ b/drivers/base/bus.c -@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_ - int err = -ENODEV; - - dev = bus_find_device_by_name(bus, NULL, buf); -- if (dev && driver_match_device_locked(drv, dev)) { -+ if (dev && driver_match_device(drv, dev)) { - err = device_driver_attach(drv, dev); - if (!err) { - /* success */ ---- a/drivers/base/dd.c -+++ b/drivers/base/dd.c -@@ -1170,7 +1170,7 @@ static int __driver_attach(struct device - * is an error. - */ - -- ret = driver_match_device_locked(drv, dev); -+ ret = driver_match_device(drv, dev); - if (ret == 0) { - /* no match */ - return 0; diff --git a/temp/queue-6.19/revert-driver-core-enforce-device_lock-for-driver_match_device.patch b/temp/queue-6.19/revert-driver-core-enforce-device_lock-for-driver_match_device.patch deleted file mode 100644 index d6b9bfa2f1..0000000000 --- a/temp/queue-6.19/revert-driver-core-enforce-device_lock-for-driver_match_device.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8819cb8faec938fa3e3b0023e1839ee52d3af32 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Mon, 16 Feb 2026 16:41:21 +0100 -Subject: Revert "driver core: enforce device_lock for driver_match_device()" - -From: Greg Kroah-Hartman - -This reverts commit bc82e5f4d7dc8237ae8cabc73aa46fc93c85d98c which is -commit dc23806a7c47ec5f1293aba407fb69519f976ee0 upstream. - -It causes boot regressions on some systems as all of the "fixes" for -drivers are not properly backported yet. Once that is completed, only -then can this be applied, if really necessary given the potential for -explosions, perhaps we might want to wait a few -rc releases first... - -Cc: Danilo Krummrich -Cc: Rafael J. Wysocki (Intel) -Cc: Danilo Krummrich -Cc: Gui-Dong Han -Cc: Qiu-ji Chen -Reported-by: Mark Brown -Link: https://lore.kernel.org/r/7dfd0e63-a725-4fac-b2a0-f2e621d99d1b@sirena.org.uk -Signed-off-by: Greg Kroah-Hartman ---- - drivers/base/base.h | 9 --------- - drivers/base/bus.c | 2 +- - drivers/base/dd.c | 2 +- - 3 files changed, 2 insertions(+), 11 deletions(-) - ---- a/drivers/base/base.h -+++ b/drivers/base/base.h -@@ -182,18 +182,9 @@ void device_set_deferred_probe_reason(co - static inline int driver_match_device(const struct device_driver *drv, - struct device *dev) - { -- device_lock_assert(dev); -- - return drv->bus->match ? drv->bus->match(dev, drv) : 1; - } - --static inline int driver_match_device_locked(const struct device_driver *drv, -- struct device *dev) --{ -- guard(device)(dev); -- return driver_match_device(drv, dev); --} -- - static inline void dev_sync_state(struct device *dev) - { - if (dev->bus->sync_state) ---- a/drivers/base/bus.c -+++ b/drivers/base/bus.c -@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_ - int err = -ENODEV; - - dev = bus_find_device_by_name(bus, NULL, buf); -- if (dev && driver_match_device_locked(drv, dev)) { -+ if (dev && driver_match_device(drv, dev)) { - err = device_driver_attach(drv, dev); - if (!err) { - /* success */ ---- a/drivers/base/dd.c -+++ b/drivers/base/dd.c -@@ -1180,7 +1180,7 @@ static int __driver_attach(struct device - * is an error. - */ - -- ret = driver_match_device_locked(drv, dev); -+ ret = driver_match_device(drv, dev); - if (ret == 0) { - /* no match */ - return 0; diff --git a/temp/queue-6.19/series b/temp/queue-6.19/series deleted file mode 100644 index 240b6c4f78..0000000000 --- a/temp/queue-6.19/series +++ /dev/null @@ -1,2 +0,0 @@ -scsi-qla2xxx-fix-bsg_done-causing-double-free.patch -revert-driver-core-enforce-device_lock-for-driver_match_device.patch diff --git a/temp/queue-6.6/revert-driver-core-enforce-device_lock-for-driver_match_device.patch b/temp/queue-6.6/revert-driver-core-enforce-device_lock-for-driver_match_device.patch deleted file mode 100644 index 6a1277cb74..0000000000 --- a/temp/queue-6.6/revert-driver-core-enforce-device_lock-for-driver_match_device.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b8819cb8faec938fa3e3b0023e1839ee52d3af32 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Mon, 16 Feb 2026 16:41:21 +0100 -Subject: Revert "driver core: enforce device_lock for driver_match_device()" - -From: Greg Kroah-Hartman - -This reverts commit adc1796eced46b48e23ec200a219d635f33a38ee which is -commit dc23806a7c47ec5f1293aba407fb69519f976ee0 upstream. - -It causes boot regressions on some systems as all of the "fixes" for -drivers are not properly backported yet. Once that is completed, only -then can this be applied, if really necessary given the potential for -explosions, perhaps we might want to wait a few -rc releases first... - -Cc: Danilo Krummrich -Cc: Rafael J. Wysocki (Intel) -Cc: Danilo Krummrich -Cc: Gui-Dong Han -Cc: Qiu-ji Chen -Reported-by: Mark Brown -Link: https://lore.kernel.org/r/7dfd0e63-a725-4fac-b2a0-f2e621d99d1b@sirena.org.uk -Signed-off-by: Greg Kroah-Hartman ---- - drivers/base/base.h | 9 --------- - drivers/base/bus.c | 2 +- - drivers/base/dd.c | 2 +- - 3 files changed, 2 insertions(+), 11 deletions(-) - ---- a/drivers/base/base.h -+++ b/drivers/base/base.h -@@ -165,18 +165,9 @@ void device_set_deferred_probe_reason(co - static inline int driver_match_device(struct device_driver *drv, - struct device *dev) - { -- device_lock_assert(dev); -- - return drv->bus->match ? drv->bus->match(dev, drv) : 1; - } - --static inline int driver_match_device_locked(struct device_driver *drv, -- struct device *dev) --{ -- guard(device)(dev); -- return driver_match_device(drv, dev); --} -- - static inline void dev_sync_state(struct device *dev) - { - if (dev->bus->sync_state) ---- a/drivers/base/bus.c -+++ b/drivers/base/bus.c -@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_ - int err = -ENODEV; - - dev = bus_find_device_by_name(bus, NULL, buf); -- if (dev && driver_match_device_locked(drv, dev)) { -+ if (dev && driver_match_device(drv, dev)) { - err = device_driver_attach(drv, dev); - if (!err) { - /* success */ ---- a/drivers/base/dd.c -+++ b/drivers/base/dd.c -@@ -1169,7 +1169,7 @@ static int __driver_attach(struct device - * is an error. - */ - -- ret = driver_match_device_locked(drv, dev); -+ ret = driver_match_device(drv, dev); - if (ret == 0) { - /* no match */ - return 0; diff --git a/temp/queue-6.6/series b/temp/queue-6.6/series deleted file mode 100644 index 14baaa7bf9..0000000000 --- a/temp/queue-6.6/series +++ /dev/null @@ -1,6 +0,0 @@ -scsi-qla2xxx-fix-bsg_done-causing-double-free.patch -pci-endpoint-remove-unused-field-in-struct-pci_epf_group.patch -pci-endpoint-avoid-creating-sub-groups-asynchronously.patch -bus-fsl-mc-replace-snprintf-and-sprintf-with-sysfs_emit-in-sysfs-show-functions.patch -bus-fsl-mc-fix-use-after-free-in-driver_override_show.patch -revert-driver-core-enforce-device_lock-for-driver_match_device.patch -- 2.47.3