From nobody Tue Feb 22 18:45:27 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 E4D1F19D23E9; Tue, 22 Feb 2022 18:45:27 +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 4K37Qb5Yp9z4R7g; Tue, 22 Feb 2022 18:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645555527; 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=WrzG89kkQF9XXArLLKcTDB6PGyXZY/QoSiiNf2vEJaA=; b=dkVj+PvzHpmF8uSbbQKoSZpE7ymkbGHj0Mq63e/xcSmgm6An0Yaav6peVAepIfGsI36uxX Z2ntfCsenqFTGyhFz92qOgwQU5nsXgnhmTQdTrTV9BgugOnyY4+rehCZgX8dwMkwC4LwmJ avR55ka5DqPKHW5d0+kLadZh6+vvrAijVeS2WWbG3g4kpg1Fqr3SDYTAVNR9zOHFOM3mJ0 CtzAzDFommpTjUmWQuXDklZ6IKJHZ44OlS3wxlv3sxqaXMDtVML7C2dd3EVo3s9TSQzCUg HgNdSHTze2N4dSnNBGGHhVfGc5/ihahB9M2UJM0pkbiaIYdV+a4P42VYps4cMA== 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 8E634163D; Tue, 22 Feb 2022 18:45:27 +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 21MIjRk9031176; Tue, 22 Feb 2022 18:45:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MIjR8D031175; Tue, 22 Feb 2022 18:45:27 GMT (envelope-from git) Date: Tue, 22 Feb 2022 18:45:27 GMT Message-Id: <202202221845.21MIjR8D031175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: ee30e4458c96 - stable/13 - ed: Remove options 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee30e4458c960edebbb9a2ca1d9b1378a670f8e4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645555527; 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=WrzG89kkQF9XXArLLKcTDB6PGyXZY/QoSiiNf2vEJaA=; b=IIiOj1iA5ShKeU0509p+IEPZktzlb03epce6mF8hUPOkdZUvCtbcO9QKQmen0Vnt3LDoRa hykH11p7HmAnksX3JxrPjNUa/BTOvxUAuuxtnjhKjh+kqZUK/MxBCmnU15xWk0jKGoBJs+ i+TOWY+3sTeVMIZ4CWbbNnz+Intwy460hlclD8SUIYUW+5yeOezBoTsRK4ui8CEKHqOjbz nW3T3PB61S3zwJRlRcn6qHBdHOQ/d5lIbTDby1tDJ2nYlpboAwvWjLnP6i3FJfJJYKIVuQ mR/BGCqs+oWLYq8sykBeOaLV6z6GQs+BRmMF5sYa/QfON4uktfw7KkpheaUs1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645555527; a=rsa-sha256; cv=none; b=h4ekvpmZkWi3melOBs1a40uruEp2+ZHHC8RmElC77jxn43mShWuRVazv0z2TazpT61hDJR n6b8SznwHZljXhLhDiAMDaxXV/5MvIVXxKtetpjIPoL1Ky49EYlerQvQsv/mwNQb6VtYuH DFNveHOEhw0vfNxCLDiuoTwBJ9srRqchVPi0GTRxXscyCD7Zpj72MJrEBnY7njg8ZSCe6w 4o6MuTIQZ0uLo2yru3CZMLJj3UZRTIlwHDS3fW9pxq10f+kc3wyNZs3UTOVO0YZkSKpXgZ kuBKH1JirDsjSN9MxL7r+IeQUJce3sRR91fcEVp5d6AOB25q90QJi4TDu/EaPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ee30e4458c960edebbb9a2ca1d9b1378a670f8e4 commit ee30e4458c960edebbb9a2ca1d9b1378a670f8e4 Author: Warner Losh AuthorDate: 2021-12-10 00:41:39 +0000 Commit: Warner Losh CommitDate: 2022-02-22 18:44:56 +0000 ed: Remove options ed(4) was removed some time ago, but these options relevant to only it weren't GC'd at the time. Remove them. Sponsored by: Netflix (cherry picked from commit 21e22be91aa0d77723f761b014a06f80e25e6291) --- sys/amd64/conf/NOTES | 3 --- sys/conf/options | 5 ----- sys/i386/conf/NOTES | 3 --- 3 files changed, 11 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index e24b4c988056..bf75a0eb4184 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -312,9 +312,6 @@ device cpufreq # Requires the wpi firmware module device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE -options ED_3C503 -options ED_HPP -options ED_SIC device igc # Intel I225 2.5G Ethernet device ipw # Intel 2100 wireless NICs. device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. diff --git a/sys/conf/options b/sys/conf/options index 78377086315b..e3154dfd4679 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -727,11 +727,6 @@ DEV_PFSYNC opt_pf.h DEV_SPLASH opt_splash.h DEV_VLAN opt_vlan.h -# ed driver -ED_HPP opt_ed.h -ED_3C503 opt_ed.h -ED_SIC opt_ed.h - # bce driver BCE_DEBUG opt_bce.h BCE_NVRAM_WRITE_SUPPORT opt_bce.h diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 0cbac313bf6f..8e56e2259e7c 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -526,9 +526,6 @@ device cp envvar hint.cs.0.at="isa" envvar hint.cs.0.port="0x300" #options NETGRAPH_CRONYX # Enable NETGRAPH support for Cronyx adapter(s) -options ED_3C503 -options ED_HPP -options ED_SIC envvar hint.ed.0.at="isa" envvar hint.ed.0.port="0x280" envvar hint.ed.0.irq="5"