From nobody Thu Sep 21 17:19:41 2023 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 4Rs2Fn6kFPz4tk3f; Thu, 21 Sep 2023 17:19:41 +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 4Rs2Fn61Y1z4fPS; Thu, 21 Sep 2023 17:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316781; 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=ESY7pWj0yxoC1ke0xf20grA2xW2NFVFbTFYh2k4zi68=; b=xE7MHJELZtTSzsNkywHaeXqhTzXU0QamqZXqI1C4uNagd5Ty7Kd3Dx/5oCqiAPFg2ohUMJ e37sRZoWVIHETjnUv2KhrrNQ9dtflgLwhKFEOSb7BAxImz/YWJS/GhEBu+fdUaTdJIsjkL hSaxw2UmDvSLTinScsaoQBaF+H8IfavO+P/mLZ5kS7UgStumfZuCejDiKtYV7MJl02ZzGW L3tpxmZQ18IFX+wSquzITL+eZc8p8Ohi0MiKKN+gda9FJAN/bfoeZKB/NEOvqSjy0QEX0U Iz4a+6s+5DwxF3m+nBen6TSgJ1xyrc7XdxZYC3xSG4Lf4NecteWRSqzmu1MAIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316781; a=rsa-sha256; cv=none; b=C+3oAWeijHsG/A1nc5g0pSjtumK+fdBu9E0KqShxAJKQ/3gCsWMAPfFkVnfeW4qHsW965Z SYd97KGk52L/E1ACvsFcjStqiyt/HULGJdqI0QX1GSELc6I+f38CnapPC5DfzFqvI4Yz9n RzSpaSPgKsy7PzcFjYgtC4A538udgFzCPL8DB9pMY2APk2Lp5KxhPKD0LawlG8j/im5mQC A8xUMpi5yG6ZjHreUFAyAaPeas0u7qiYoIqT9GOpb9/YQUCSIPPMyag7qaAkzDlnp+vs8G /N1c7L8lNYE9xnwjgNCMBpJ2Apbyx3Mckv7PNNjHMo7rofm4Uf2F0/IIdKqBLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316781; 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=ESY7pWj0yxoC1ke0xf20grA2xW2NFVFbTFYh2k4zi68=; b=OUGh/RG/HEQPxzzsUpYMG7Rr24QWDz47foJWg/FCd7VP2Mad1uD0lTEeGkwbwyaHUg/2Va GdV+JWk2wMHeqw/1fY6o0NZLNsXAbdtoinSviZ/dfaiSt7yyZzNqNM0YRll6MMyzq9QhIl 7Goja8RCYWhj8dnFqZTyMxwYtMNBK7QmHd91C05L9FMlZllTtjmHXsvg64ps5o5ZltMxCP GNYwLOpQyz+BZTqRLofbE9hnSkKGnNpSBstdlVbfkghC+DdVsWcF5pvN0lDeb0pUSeLpHd zaUMwQotZYQcn7ceFPb4d7TjjvHlSy9rwbUW14Yk49c1Cc0pv0GPiZWJ4CmClA== 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 4Rs2Fn4pmlznHN; Thu, 21 Sep 2023 17:19:41 +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 38LHJfDO076676; Thu, 21 Sep 2023 17:19:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJf72076673; Thu, 21 Sep 2023 17:19:41 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:41 GMT Message-Id: <202309211719.38LHJf72076673@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: af6aaa90057d - main - iwlwifi: re-attach to build after updates 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: af6aaa90057d75644c41527acc903082104e4114 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=af6aaa90057d75644c41527acc903082104e4114 commit af6aaa90057d75644c41527acc903082104e4114 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 17:12:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:12:01 +0000 iwlwifi: re-attach to build after updates While the build-breaking changes were only in the window of the two commits, 3e1f5cc9a81a..9af1bba44e1c, further updates restored some functionality as well. Now that we are done, add iwlwifi back to the build. This reverts commit b75d1ce6c10652fc4bfbf509deeae0e05c3d1356. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 1b4b1119c0f6..d2c5cc44705a 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -560,7 +560,7 @@ _mlx5ib= mlx5ib ${MACHINE_CPUARCH} == "i386" _ena= ena _gve= gve -#_iwlwifi= iwlwifi +_iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif