From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C339242D76; Mon, 16 Feb 2026 16:18:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771258693; cv=none; b=isJyYcQrFYdSl4D9auNadCH9fX5gkCguIuEOM8lttJuzfbjakWnI6dbd3geJDMN/AlZp1vB27mM772efJvItGc7cT7I58tstXeuDyuqa10x9YZOq69kd7DNPsazehsKwkh2BJDtErbKj+cZS/Zrjt0vzVWtsp/Mymh/9DM42YKk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771258693; c=relaxed/simple; bh=4vma2eCI+3FwfwRomIgrdcaYY8edi3EpoXm1zuKVlvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y0YwSJbs0oHUhy5UIAPv3FM6RD36q2CvFf+tkXWmsrV242SYoS4a/DrMmrJN/4GAdqRhgN3TCIn4qqdV8XtChqpalQSm+mwPNkRC9BjObY6gnQF57VJStl0G+tbeWC7wO2PIFZmuXwYfwqpyf2tyE+yYfn0U5EsiUbjmp3Bqsdc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=19EjNhGE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="19EjNhGE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9AD6C116C6; Mon, 16 Feb 2026 16:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771258693; bh=4vma2eCI+3FwfwRomIgrdcaYY8edi3EpoXm1zuKVlvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=19EjNhGEcu3E4sS6omyDSGRY2D7zmYXg4E2fYey3jNK4/FAvD07wg7lSlcwUr+MhJ 68MKgs71Tj3woshLUqYWJCnf64AL4KBjjYBohTiupYma5aKZO+EeprVwrL3wArrtq0 Ts61h1HeGU2uR6Q18+er2fJAkxxgi9Mm0tfYa4N8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, stable@vger.kernel.org Cc: lwn@lwn.net, jslaby@suse.cz, Greg Kroah-Hartman Subject: Re: Linux 6.18.12 Date: Mon, 16 Feb 2026 17:18:01 +0100 Message-ID: <2026021637-chair-unsecured-7fe1@gregkh> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026021637-amused-crimson-13af@gregkh> References: <2026021637-amused-crimson-13af@gregkh> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit diff --git a/Makefile b/Makefile index 1d8d4b2c1da7..09153bd3bc5d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 18 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = Baby Opossum Posse diff --git a/drivers/base/base.h b/drivers/base/base.h index 30459906987e..86fa7fbb3548 100644 --- a/drivers/base/base.h +++ b/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) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 999d371bbf35..5e75e1bce551 100644 --- a/drivers/base/bus.c +++ b/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 */ diff --git a/drivers/base/dd.c b/drivers/base/dd.c index b6b9132e1f94..13ab98e033ea 100644 --- a/drivers/base/dd.c +++ b/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;