Merge tag 'v6.18.12' into 6.18-main

This is the 6.18.12 stable release

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmmTQYAACgkQONu9yGCS
# aT7E0BAAzWRKdcav0o0UIvIUCShymyewQLzsPeeMLcnr2ypdEv8pFLBccyKgB82k
# 6qVf2wEt1H/ZH49qzQJdGiwdLNf0aJXigCvkTmWu32D/rFK6a83Zk48/qMJJ5T2I
# 4QnKmB1bwLMdSnBXrEC2GcK2YhTSrUCm8HmvOKSn33S+Kh+oLQqNAhtXWDRpONVV
# hvA1+S7/lUOFItNDHt4Qj/35dlsTnEjC6wtEZ/HMfzsbrb6oeIwUSFabfSGsaV8D
# mR5/YJ//iv7jtXybgRQHnHsjvaUSckRp94R9FsPkefQClvJ9x/CZJRzmmmhhrwMO
# rRWXFyJDG70/rG51Z7RtAjNV+1j0cegGKyPGVSK8zbEnIMSBoWstXZz/xPvNbrcF
# unafDl3wXsh8hYsVisuMU1U3SK494Kayh3pRadVsgo7F4joSE8RVlG/g89524YR+
# 4mWJWZmGNgYWoS0f1WzkAc/Q2159GxHaoPW74uZ7ON5G1wXccMhrqKxZsiB00gkc
# WWKbSJWL08pcR2Z8fO9y0jUQ2frt4zY87SaQNmR6Z98N11Axxg4SUzaN3wjDPSBR
# vgohRnAY1UXth3cKtd39rQPxEjTDk9jL6pv743WD3fnU9H0lTTJm2VmJ8b+TJ6/x
# O8FT4dYU7YveW4BWlFcXl19LyhfLxv4KvSwW1c/BWwfZVgukPuk=
# =ALY/
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Feb 16 17:10:40 2026 CET
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key

Author: frank-w

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 18
-SUBLEVEL = 11
+SUBLEVEL = 12
 EXTRAVERSION =
 NAME = Baby Opossum Posse
 

drivers/base/base.h

@@ -166,18 +166,9 @@ void device_set_deferred_probe_reason(const struct device *dev, struct va_format
 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)

drivers/base/bus.c

@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf,
 	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 */

drivers/base/dd.c

@@ -1170,7 +1170,7 @@ static int __driver_attach(struct device *dev, void *data)
 	 * is an error.
 	 */
 
-	ret = driver_match_device_locked(drv, dev);
+	ret = driver_match_device(drv, dev);
 	if (ret == 0) {
 		/* no match */
 		return 0;