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 F324D35949; Mon, 16 Feb 2026 16:17:26 +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=1771258647; cv=none; b=a7QT3hD1QhrxoL1DGhgIupUvJEJPCwQKaKsWjdqbChFjUjLm/oDrFbUVf8chQx04SRDokkOZwgE6whlDQwl/Xxrj6+FQKPz91ED8VXHkj3GSnuh/i5TuG426SE6UTKf/1EgmfyYC4MiLeObZKcTmLL0/u2c9vVSnRXpEX7ST4Fs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771258647; c=relaxed/simple; bh=W1ncaF07FlXq8sziJroZQZF4LWKH2vxC9xC/7iP+bI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u99Ykd6w/ub3+QdHb18Xj64bPez8o8AfQoFRSg3W0sKvY4k1eViN4wK3quH6GL1w7fNr7tPrnN7lSc8EEi+lAPfEGcYxXHAZo6qPHg7Pet3HkJnVVtADNenMyaLJLDJVQUzZZWmN8WAOqlhkpA56GvYZ7QmgAx4qGoGvvuLrWqU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QLcG1GzB; 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="QLcG1GzB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CC10C116C6; Mon, 16 Feb 2026 16:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771258646; bh=W1ncaF07FlXq8sziJroZQZF4LWKH2vxC9xC/7iP+bI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QLcG1GzBTlpzrcc9T1dfjJiLtmD6Fc9Nc2hUCwM19V/wmyL1Ite8mMgZLtE5N/LUN u2oQK0UmcVCfyBJ6OJpakMBjKfiYS4sgyamCTqB+vjYOXBXfdpulI7uTKx8Gd2vTfo cBqIBSIDqJwfV9Jpb7lcCJ4e35WGBotEi1NkHYh0= 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.19.2 Date: Mon, 16 Feb 2026 17:17:14 +0100 Message-ID: <2026021619-snowless-founding-afba@gregkh> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026021619-phrasing-booth-18a8@gregkh> References: <2026021619-phrasing-booth-18a8@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit diff --git a/Makefile b/Makefile index 965228c1c2ff..f0eb659930b2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 19 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = NAME = Baby Opossum Posse diff --git a/drivers/base/base.h b/drivers/base/base.h index 677320881af1..430cbefbc97f 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -182,18 +182,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 331d750465e2..9eb7771706f0 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 ed3a07624816..bea8da5f8a3a 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -1180,7 +1180,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;