From nobody Sun Sep 25 21:43:32 2022 X-Original-To: dev-commits-src-main@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 4MbKBr4JQ5z4d2NG; Sun, 25 Sep 2022 21:43:32 +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 4MbKBr3q9Jz3ksq; Sun, 25 Sep 2022 21:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664142212; 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=485A2Z8SW7yo8oF6+q13yeGWIBwJhuTMpW79aew6JkA=; b=I1vk47CYDVJgAnPDErgLqmL762J3s5BbN/hcM2j1MC+Y7hMj1CG9O23FQhtNwgXPoKGgRy kxkPFz+Inobz1uK7Uf5mOryKJFGGMcIN8Om+eF66RdyfOnDY+EJHYistb/hfLyR4u42sOw HGQfJjgYfbWilpY6hkNNYKnZjuoDuJbQaj5EyqTaNSWVDnfwvPDtja0sA0aDTKIMPKSWeY Ni3R8IKkXK8t85ueU+TOtqfBKipFIbDYlNOBeqM1y9RlJO1KZxte7k5hNbNMMkbrp8MjV/ zhlhnSadS6Dv1QWxyQ5fg8Me1lemM5Km8uijO78L32NtUn7ao2PS2M3PdM+UPw== 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 4MbKBr2wXszYvr; Sun, 25 Sep 2022 21:43:32 +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 28PLhWVi016174; Sun, 25 Sep 2022 21:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PLhWGl016173; Sun, 25 Sep 2022 21:43:32 GMT (envelope-from git) Date: Sun, 25 Sep 2022 21:43:32 GMT Message-Id: <202209252143.28PLhWGl016173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1a2b55732ff2 - main - lindebugfs,rtw88,rtw89: correct module dependencies List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1a2b55732ff27fba2533724a72a39d33516c9417 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664142212; 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=485A2Z8SW7yo8oF6+q13yeGWIBwJhuTMpW79aew6JkA=; b=DXJ6KGbDIO+UA3jOXM/V5gcIpP7I5Yz319FpehRM9YA/kvUK4PhpqYnbmRZXVkGSpPacHd 8A5S2xZrf7brsWefGWn7lxrtDBerfz5FCKfggRSKPbRlwAXhEpjeRIzVEVZLg5lkbLUra1 8v4KztRy3JPHS7zJ7FIZYMemsZ/MlkqIt591iFKdNR/SPPK1H/gtXJrwmWFMHpBi3A7drd FtgQbLTRGW1dN9hVi50dSaHF3dIdDhyrZoIBZW6p1OKjP1wXzTPoIRrTlbrSfXPrjqN8HI bVgY5w7w+QE/fntmTM70HoL5k+2FgrjueeCeQExTCg3oSI2TityeMOy5Z1fdEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664142212; a=rsa-sha256; cv=none; b=TkGDJX3mkZ5EWPl5ixSz6yrconO1r7pkfN5OPDR88KhkcSyd1Gn8F1HWk/LGQQnalm0Kil 7ZarYxUa8u1tYTmtqzKGP+xSOgzpbfuS4zINyj4CjwKDxJOnk6pGLwwSLqoIw9TbqNJnEU Fk6Lp7zsZTBuTbaDkAEsnqxG/IjVpn+ATQBOuTUVZhUHRhjY9Zut9tfby7ku6B927pXS8B c7hsPquWk3nZRdHHt5kWmCtFLrw6UTRVf8oho4ikbq5/7/rqHfOZaptgJjtk8Eo5o/FMIN U3G1fv3d+GMKsJtYC2JfZF+MhLiVwQNFU3xPGDLLPrHW3HAUhiu86e3qt7vXSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1a2b55732ff27fba2533724a72a39d33516c9417 commit 1a2b55732ff27fba2533724a72a39d33516c9417 Author: Bjoern A. Zeeb AuthorDate: 2022-09-25 21:36:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-25 21:41:22 +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. MFC after: 3 days X-MFC-with-after: f697b9432d9c7aa4c5ab5f5445ef5dc1bd40ce00 --- 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