From nobody Wed Jan 18 16:24:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nxrgr68ntz2yJ12; Wed, 18 Jan 2023 16:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nxrgr5M21z3DDt; Wed, 18 Jan 2023 16:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=erQjhqyisNDiY2GeFioAvKq3aGr8+rgn9nE1Gb028dM=; b=l1ygI2qShjmt4LywZag73ryS78jRbHZQzV3L6cWTVYpVTtN+4ZJkTP/e7PCWQc4IsU/HaJ ABLRhWYVwcYJQlOxhsGGr6NXYOIcwQIPyKZucQLEoKzTNB+wH9uEVf0sZvgB6DErtP1dHh kIDhRd6BbVO5juI4mgNEyM/jkvhl+BN6B8HnWwvfyF0kQ9F9p2WImnvgGMazYFWUWeZHf6 KSs5k0Hqfx9Ar8/LKwyGAUwxOiLDwq9bZ6pN7zjNfiiJKo5lnC/Zsk/ooqqXHxIhiW0ghi w/jAOH+rEwc3/OOzwXuJLDaHwlwDq40NtKkZTpdJhM2jtjfSC8r+mmhHyT1BWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=erQjhqyisNDiY2GeFioAvKq3aGr8+rgn9nE1Gb028dM=; b=fkKKdIDZPUlZlTKnJwnlDImjpMut6/uChow089ULwRjEm/GFUCDdHGjMOhiuvHRj2lKuWS A3iyPGR+7txIfYp4fhZ7cSUypRQvql1j8EqFIW/dUaQmFW0PvYuLY9+QO9gpE8ojv5/TZC ffkzpsmybEGuSSAiEFFrfqymPL7ZpfXDJdn1RdUNOBDhPdcYz4ef7VSiJdC/hO5URntw6R DCUldA530W8/Z16c8CcQxUnRJyNLSPfaPVEwLbEUKVeNseiDXdLNwlfpxtX8dzsgXIdsD3 yUuPx7t6X+X2Q+ltBeRYt4wsEZ4xfhUR5LuQtVyVvPcaGVgfsy+sOm78kzgT1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059080; a=rsa-sha256; cv=none; b=GuCvANO4jV3GhU9eoSpoJxWHMgQD02URTDoTIOL65DIl74WpWTHcmIlWsxeMtSYqEJGPY8 AQdgiV2IrBz7AJ1G210MwKdhSvqufgCHfamYwl/CQwC0qdCuAyC1M/i3avqYGLkXr5E/xm QkJV3m+qDV5uhthDYOI/yqebvsM1k50f2Taz05wBrQPcjq1gn7l3fgD6FVc+MOyjA2/lgi dGaCUrB4zSqHEYCQcpxVVQVkJQX9P5eNqKEcRTcBCAtGpXRtYMA+7+J7PV8osue8Mf/gDt Trog3TjPpgzu7EQ8OBi+GULoOsAKzUjco4oPtDP5yU01yfH6RL8Y4udd5CXIYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nxrgr40cdzHp7; Wed, 18 Jan 2023 16:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30IGOeES037733; Wed, 18 Jan 2023 16:24:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGOepA037732; Wed, 18 Jan 2023 16:24:40 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:24:40 GMT Message-Id: <202301181624.30IGOepA037732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2cf1918dfce3 - stable/13 - lindebugfs,rtw88,rtw89: correct module dependencies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2cf1918dfce36f3db1fb263ca6e247a8c259ac28 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2cf1918dfce36f3db1fb263ca6e247a8c259ac28 commit 2cf1918dfce36f3db1fb263ca6e247a8c259ac28 Author: Bjoern A. Zeeb AuthorDate: 2022-09-25 21:36:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:22:52 +0000 lindebugfs,rtw88,rtw89: correct module dependencies In f697b9432d9c7aa4c5ab5f5445ef5dc1bd40ce00 the name of the PSEUDOFS was changed from debugsfs to lindebugfs but the in-tree consumers were not updated now leaving the drivers not loading if compiled with debugfs support due to missing dependencies. (cherry picked from commit 1a2b55732ff27fba2533724a72a39d33516c9417) --- sys/contrib/dev/rtw88/pci.c | 2 +- sys/contrib/dev/rtw89/pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/rtw88/pci.c b/sys/contrib/dev/rtw88/pci.c index 6c836be771bc..bad6dd5b5b98 100644 --- a/sys/contrib/dev/rtw88/pci.c +++ b/sys/contrib/dev/rtw88/pci.c @@ -1955,6 +1955,6 @@ MODULE_VERSION(rtw_pci, 1); MODULE_DEPEND(rtw_pci, linuxkpi, 1, 1, 1); MODULE_DEPEND(rtw_pci, linuxkpi_wlan, 1, 1, 1); #ifdef CONFIG_RTW88_DEBUGFS -MODULE_DEPEND(rtw_pci, debugfs, 1, 1, 1); +MODULE_DEPEND(rtw_pci, lindebugfs, 1, 1, 1); #endif #endif diff --git a/sys/contrib/dev/rtw89/pci.c b/sys/contrib/dev/rtw89/pci.c index 046bcdf4dbc9..078d6f0e5866 100644 --- a/sys/contrib/dev/rtw89/pci.c +++ b/sys/contrib/dev/rtw89/pci.c @@ -3937,6 +3937,6 @@ MODULE_VERSION(rtw89_pci, 1); MODULE_DEPEND(rtw89_pci, linuxkpi, 1, 1, 1); MODULE_DEPEND(rtw89_pci, linuxkpi_wlan, 1, 1, 1); #ifdef CONFIG_RTW89_DEBUGFS -MODULE_DEPEND(rtw89_pci, debugfs, 1, 1, 1); +MODULE_DEPEND(rtw89_pci, lindebugfs, 1, 1, 1); #endif #endif