From nobody Wed Nov 29 16:38:29 2023 X-Original-To: dev-commits-src-branches@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 4SgQ4Q119Wz52wvP; Wed, 29 Nov 2023 16:38:30 +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 4SgQ4P5SlSz3Jm8; Wed, 29 Nov 2023 16:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275909; 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=gAsefyloSPCIUsjYtJoS6P2cv+E5zdW5x0T0ieRIgzA=; b=AYaaRfwkHgRlM0rwMVLGGT27hTzSHs+WIrAjS7HYQmxUvHbbHaKQJVkw8ctm9Joa2NDUtr XwkHnwxolvOna8i2LBwYW7va6xWPPcNoRl7GG++8ETQ8zk2ao7KVg/qRj+rW6bjEHtsQ3/ Yr7BhsbsgSFhPHIVaLZgTpGqwrbJcvHMABQoGuFpzPrx1yZMwzxsxl6jwYq0T9iiHdHQVS xZjAqudbc+lmNjLDbe5Xd0Z4VNaLgWYZ61jOX5TIGI4D7RF2hCNey1Vpq7FkWAtkpM163z lhpE3qAl/aO/amoz29DYRc21r+3UMJgORDy61Tt8eaiigBMAb9Un/zOo74PbZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275909; 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=gAsefyloSPCIUsjYtJoS6P2cv+E5zdW5x0T0ieRIgzA=; b=b6ilgHpddsNj+9tV96ToaJBCyoHfM9KbX8YzbHwqPa6I+24LL5np52lmAmDGfoqppi5GDQ aT62cgDLZMQVJ5RZjaxXjIagoPN12kaZrm4f2iEbrUQHWKFaDtkXDvCJyBcabyuNNEIvj3 T915wj49lTiIs/iD9Q3zgTRa8LmGrTxq6jfKfUR2AzCSiIrkQKGuATdrmGnls0c1SyXVi5 5GLpjQ1aUEokrsV9Q2raBfxo4HorLlBUeOO4I+8cYeNM2Rp7jQJtxg+HgxF48qubcP23zg Bo58A0+9Kd5oMivAwBXpkzp31cYvK7C1Bg6XhVGijCqfR1JajCIBK6EPTFt+Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275909; a=rsa-sha256; cv=none; b=pilrHRTNkQ3adYa79vt0zCqQqyvAOK6C/0SFWUaT7Z4pGy0gYqMLGKVY4NywGVNJuM7L5w 6CkXFzkCvrG2V8nhkf20VJYVEAd01xJOnrNJ2rFnyAmojKDS0uqW1p0pBKWrf0qPoLs4A+ H473QV71YXwFm+87mMJ/Pp9TxYxvktxoKvYZUfHqeh2urTDHjRH9H1pHGCxEAKidP6Zx7n lBB3OAusj4QpjqUUHaYKMe/2YvRPKhtHWlJmptSGPhQrrZh0cTVbFw80YkMoIyy1t74x9O E4JvKxsqeNrkY+LYSbrZOALqMWnXEiNFi/xY/uINzWFhLG7asYOUn17af91WSw== 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 4SgQ4P4Xxbz1Cd5; Wed, 29 Nov 2023 16:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcTtv045969; Wed, 29 Nov 2023 16:38:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcTtI045966; Wed, 29 Nov 2023 16:38:29 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:29 GMT Message-Id: <202311291638.3ATGcTtI045966@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: a34d2eb4b2ca - stable/13 - iwlwifi/rtw88: re-attach to build after updates List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: a34d2eb4b2ca5496bbf21906fbb5f1ca51b6f3ff Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a34d2eb4b2ca5496bbf21906fbb5f1ca51b6f3ff commit a34d2eb4b2ca5496bbf21906fbb5f1ca51b6f3ff Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 17:12:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:08 +0000 iwlwifi/rtw88: re-attach to build after updates While the build-breaking changes were only in the window of the two commits, further updates were easier to merge and restored some functionality as well. Now that we are done, add iwlwifi/rtw88 back to the build. This reverts commit b75d1ce6c10652fc4bfbf509deeae0e05c3d1356. Sponsored by: The FreeBSD Foundation (cherry picked from commit af6aaa90057d75644c41527acc903082104e4114) --- sys/modules/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 71b22941f261..a61b4ad19095 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -540,7 +540,7 @@ _ipoib= ipoib _iser= iser .endif _ipmi= ipmi -#_iwlwifi= iwlwifi +_iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif @@ -557,7 +557,7 @@ _mlx4ib= mlx4ib _mlx5ib= mlx5ib .endif _ossl= ossl -#_rtw88= rtw88 +_rtw88= rtw88 .if ${MK_SOURCELESS_UCODE} != "no" _rtw88fw= rtw88fw .endif