From nobody Fri Apr 22 22:50:20 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 348D11995C17; Fri, 22 Apr 2022 22:50:21 +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 4KlV3x0Z7mz4mn1; Fri, 22 Apr 2022 22:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650667821; 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=xGzNNBpR/uNTMddQuCiY9og5ngjLGOnKGv6/MePizLs=; b=Yc9HInbsg70PdQSA3h/bZW0nF68ZL/BQSDIhWcNdsnTZ1G78t52GCahjtWh+dY8ZmjbdWf AeCeQjqrnnQtsg4ifapnnuF2nDqKVbuRXb1wamf6l6lSZKlMlJXlsqSKTOlTPB962Zy+3q IV1tuE2u8Fd3pRZCwPfj+Qoi70RS1h5BSpVV56jM7DcFzNEQsJpT0dloJ1p08QtePG4QM9 S7aZFWed+P9402J8XCK7iNmQLImVjMKKojR1w92U0xhqjjZ2/ToZwThMvB7q2wz6RoeA7g 5PeQxI+ND1sI1kiSCj9pGr2vbHI44ng1WH/wNHMX2CuDKWuC+iQ61XjAaWxrUA== 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 E523526165; Fri, 22 Apr 2022 22:50:20 +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 23MMoKHx087865; Fri, 22 Apr 2022 22:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23MMoKZM087859; Fri, 22 Apr 2022 22:50:20 GMT (envelope-from git) Date: Fri, 22 Apr 2022 22:50:20 GMT Message-Id: <202204222250.23MMoKZM087859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5bf623bbcdfa - main - amd64 NOTES: Sort the axp entry. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bf623bbcdfaa5be2d639317b601f2019ba3ed28 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650667821; 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=xGzNNBpR/uNTMddQuCiY9og5ngjLGOnKGv6/MePizLs=; b=bcq/5FTWeFJFYEDUHtUuTVBUMkOqhYvsicRNKJcbLei8ilxpSTj8ipNCAIjlwJyj9pmATW rJWCK7ne0piUh7O+yLVR/GWXsxn42MdMcy/xCSv/u8Z/2xhfJPRBsU8DhVdQnKRc+c9DMD H1ZZJKyzEo7e6VMmL3F+KmOtZH+4kxPDzGT+hy5VGS/yL6dv9z6BBeXGVwO3N5FK+kAHG5 slqDO1U2ANXF3AAdQJ5AXpOBGIeqwWauELWMMZB2L+a7kWhMI48nF/GGSS6BnBDcUvBj37 mrd9j8SQCKysvbNMIX5AH3rSy7kD84ehGuzKlCaHg70b48zaO8a1PV6r2PlvAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650667821; a=rsa-sha256; cv=none; b=SMQdrHpnpgsmW9yXUTop/9qT9mMnBy4m3QAfTdEKtTglS/N4/lGg5A9RJY4bMJdSatGPBo yPYEtTaupAdbpEUwr+7jCaFTuIlcCaKXYPr9cvfpVmyrtc1c/NB0bCEJ8/0V646r2XZ0JH Dtfp0Cr1EtC2xAQEvyEGQVC0WtIlc1KPEdEKeyTTiRhuOozDmPVNMEZ82+K82ap0V45rjq khf1143uwCZ38lTR6glOtxcXMi1LUvUj2rMP9z+YsF89hrOHNdBjECrA6Dxyo7DX7Qpifd P0Waz6UnJjR/+/r0lPq4e+wvQ//ODW/EZbzrOyrC8VgKLN7XbpVFnijoZYrINw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5bf623bbcdfaa5be2d639317b601f2019ba3ed28 commit 5bf623bbcdfaa5be2d639317b601f2019ba3ed28 Author: John Baldwin AuthorDate: 2022-04-22 22:18:06 +0000 Commit: John Baldwin CommitDate: 2022-04-22 22:18:06 +0000 amd64 NOTES: Sort the axp entry. --- sys/amd64/conf/NOTES | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 7ee1b45e6ba6..5af3176a0d93 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -283,6 +283,8 @@ device cpufreq # Network interfaces: # +# axp: AMD EPYC integrated NIC +# Requires the miibus module # bxe: Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet # adapters. # ice: Intel 800 Series Physical Function @@ -303,9 +305,8 @@ device cpufreq # vmx: VMware VMXNET3 Ethernet (BSD open source) # wpi: Intel 3945ABG Wireless LAN controller # Requires the wpi firmware module -# axp: AMD EPYC integrated NIC -# Requires the miibus module +device axp # AMD EPYC integrated NIC device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE device igc # Intel I225 2.5G Ethernet device ipw # Intel 2100 wireless NICs. @@ -323,7 +324,6 @@ device nfe # nVidia nForce MCP on-board Ethernet device sfxge # Solarflare SFC9000 10Gb Ethernet device vmx # VMware VMXNET3 Ethernet device wpi # Intel 3945ABG wireless NICs. -device axp # AMD EPYC integrated NIC # IEEE 802.11 adapter firmware modules