From nobody Fri May 20 00:35:18 2022 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 19A7C1B44D2D; Fri, 20 May 2022 00:35:20 +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 4L476b1B2Tz3q1W; Fri, 20 May 2022 00:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653006919; 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=68M6aUDtuSADxaULb1KnBLNKsU105k6IOlHQ31DH/5E=; b=b0zNVujm8KTVf0MYIlc/VH+cq3yuHRow/fhR7xQVLZaoU6VmoMpil1950j8g/Aug59Btmy 6Bm939qwwttHcZR1QPMnfYdFooloePCuNp4L16EFpaXJK1T2mawFjkos7lvEt22YgPWbC8 NVWKelvTbGcwpyq7xORUKd+7IyTen8+U778+rA5W5vy7734oyDArJHtkcSMgP7ZLv26+nc kTnpTmGCtCPNdcPClONhL7DC2t1bO2MmtoL+5XNIYQYcPEH2qXKPSUtDQ2Oti1lUIhvBs4 RHFOu3zuUxOcPt6X/WfEgdqq3jhi8yCImkJLMuvNJd8TJ6jHstKnTtW7U1HBCA== 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 EFADD27F5B; Fri, 20 May 2022 00:35:18 +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 24K0ZIAe090606; Fri, 20 May 2022 00:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24K0ZIcY090605; Fri, 20 May 2022 00:35:18 GMT (envelope-from git) Date: Fri, 20 May 2022 00:35:18 GMT Message-Id: <202205200035.24K0ZIcY090605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 57120a1140de - stable/13 - amd64 NOTES: Sort the axp entry. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 57120a1140deef749ea44709e176f16ea5eab647 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653006919; 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=68M6aUDtuSADxaULb1KnBLNKsU105k6IOlHQ31DH/5E=; b=pnQWyMV4iAyB/VeJ3jcBCwST5RtbsoeAd24+4dm3q634G70iuMTddbvvJFRyNtiA0xBLBe U1L8iPf2mEOAsx8pHaPIRkD5Skl5IKLP6wbUGghtJeMqnDq/Ve7YAnRS36JpspeoysTPBe s/M6qZ0KIrgnli6lrpIRzVDBMBlNHef+zRCXrUdagagBe7HN07E7JchVcHhY7yrK+oSt0/ aQK9TusICaQQ64DNKyqruRNU5eYuUAhFlOt0RbaDGw2H2hNLlxgguliHIglE3MIqhGiilv U3pnmGK6O4IyvBt7JtElu3JyrLOLkHvkgqNbJyO3MWEp9tj05Sj+sJsfCySGEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653006919; a=rsa-sha256; cv=none; b=sZc9Ik7H/o9BU5MRB41uLwoj5Fkcy3pw27zl1Jov/VWl7/JI0pfozHyGc8KybQvTnYy1Xf GYQb3L6ZzVqPBFvacUzw+X4jdY4M6eYMxm2FKWTMR0lGJE/V4GjHm9zacTRW9Sp9QZjlxu udX46Gq+lfls4Yz4YKgVPnAEJwGf2kB9oOzEW9lCse6O1DHeMofqFtZk/bEwla+U/8FWiC 09BmXSu/4nb7kd74iXtR68OCe1bJ/3i7incWKEa9UJWcBYqX2zP6VSvRQSSHF2DAEsT1L1 OCE0OgTqV0SWFtzFUgFT8wUmT1KNPuLn2rNv1MKrsVd+91EuhS6mDROeXM6kPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=57120a1140deef749ea44709e176f16ea5eab647 commit 57120a1140deef749ea44709e176f16ea5eab647 Author: John Baldwin AuthorDate: 2022-04-22 22:18:06 +0000 Commit: John Baldwin CommitDate: 2022-05-20 00:22:15 +0000 amd64 NOTES: Sort the axp entry. (cherry picked from commit 5bf623bbcdfaa5be2d639317b601f2019ba3ed28) --- sys/amd64/conf/NOTES | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 54ca25e42c40..b13d19760768 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -286,6 +286,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 @@ -307,6 +309,7 @@ device cpufreq # wpi: Intel 3945ABG Wireless LAN controller # Requires the wpi firmware 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. @@ -324,7 +327,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