From nobody Fri Oct 06 14:25:23 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 4S29gm3Wk9z4wgWY; Fri, 6 Oct 2023 14:25:24 +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 4S29gm1m9yz3Rbq; Fri, 6 Oct 2023 14:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696602324; 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=W9XBO3JTT0ANK405NowSvLCLBY6SXT5R5Zzh24WdpR0=; b=AhL0JobQmR8tKZ3WsH3Di9XxE8YfJ/Sc5Wse0+EuQZdNUPX52GPrxPHm+LbI+oDyluie8+ 7BT0J/NLVp/4YfLScsFEi5OnF2JGEUIOCc6eY2ohIHfoHZ1utogxz2uGRjreRzb+CIwq5f fCmP74fbBXCjhtKecAzz2VrgVJ5uPx+yHb/HvDSftGCbBTDx0VhYs3DsMfKG6Bxto7VZND W/5oDauL1cP0NJ8Ino0V4kESw8v+Pptbvn0hizk7Z8w1MBJfuW8PSl82k56Z+kklQU1UK2 f62DqfAiFWN/5k+Ga555L4eJAkP18XnRI568pydyCzWAbJFHCZij5tr+sgcUqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696602324; a=rsa-sha256; cv=none; b=b+k48RLKtHM+lFVdE3woqcZLEnacnmlJ/NwN55Te6RXQwuq0WQj6AjB37pqoAAVBNXqcS7 kWlhJsEwRmblWf1+7VbGatQcRCOmb8vmbRTw028um+Ql7QrjFOM8wj+GCExN23cUHAALks ya/AOpqFvfcwGgDS20eOyrfnYi1UngOMbzYjW45NXyUWwMrNTG4LT6YkVfqXKiRGenboiO tS49PiLETiKVCtGbxDYbToOaUv3QOCMJoh4MbwkgbGvyuSaOoP3Tr+1SQVqtEpQCi6nDXk J0EH5xhQF6HS3556RssiAtmfJAiSPkLb5RaLmkGUzamxl2UJZ2c8pUxIA4lnTg== 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=1696602324; 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=W9XBO3JTT0ANK405NowSvLCLBY6SXT5R5Zzh24WdpR0=; b=S5s7X9BzQqbcDoBEc3FSMKyTcp05AX/8pI9N+9ZOIYgntC6QhbOhc9YNKlb9d4Bf8JdTGk izrQiVyXIw0vdU3n5OwuUB+88WSFVh0QFhIhZitiUItkSHY5vPW7tfcS2fD8sg43+VlFP0 wpKUyGu6uoa0ljZvBZCh6R0zv48mB24uDP/mLsBT+b3QGp1ot6qlKfzAAlv7DfNJ7gRFjK laiK7DV41x88EHSfjYnBy+HlUjegD9yz9xK70GNneXTsKZnsqQ9fsJfjV7oBxHyknjrXp7 b52PCytGBGdb/RgUllCxWxwhClhJQoF7kHw4uIRp/klMjPaqKfSW0ltX5z8hPQ== 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 4S29gm0bckzr9V; Fri, 6 Oct 2023 14:25:24 +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 396EPNtE093883; Fri, 6 Oct 2023 14:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396EPNQi093880; Fri, 6 Oct 2023 14:25:23 GMT (envelope-from git) Date: Fri, 6 Oct 2023 14:25:23 GMT Message-Id: <202310061425.396EPNQi093880@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: 7ec227367ed7 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 7ec227367ed748011a97540296b0935de877cc5a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7ec227367ed748011a97540296b0935de877cc5a commit 7ec227367ed748011a97540296b0935de877cc5a Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 17:12:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-06 12:47:42 +0000 iwlwifi / rtw88: re-attach to build after updates While the build-breaking changes were only in a smaller window further updates restored some functionality as well. Now that we are done, add iwlwifi back to the build. Sponsored by: The FreeBSD Foundation This also adds the (updated) rtw88 driver back to the build. Functionality has not been tested (much) so might not currently work but people offered to test. (cherry picked from commit af6aaa90057d75644c41527acc903082104e4114) (cherry picked from commit 299e2d5724c2bc4929b6eac3258f04055e97992e) --- sys/modules/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 66d7c895a460..4b98c7ed6e0d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -561,12 +561,12 @@ _mlx5ib= mlx5ib ${MACHINE_CPUARCH} == "i386" _ena= ena _gve= gve -#_iwlwifi= iwlwifi +_iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif _ossl= ossl -#_rtw88= rtw88 +_rtw88= rtw88 .if ${MK_SOURCELESS_UCODE} != "no" _rtw88fw= rtw88fw .endif