From nobody Fri Mar 27 12:34:11 2026 X-Original-To: dev-commits-src-all@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 4fj0Sg56Hvz6W7WZ for ; Fri, 27 Mar 2026 12:34:11 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fj0Sg43mPz3s5P for ; Fri, 27 Mar 2026 12:34:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774614851; 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=LO/cidVo3g5n9XLwysQ8+CBgVYLSX2sU1QUut5A4cPU=; b=wasqAyPF652aKdtL/yMPdK2pd/7g95yQj33yVshKiXnl20ni4lmupeSSHYRn25kSfB0EeE Ij4mDtBCuSXlPXW84ELbxl1yzBoLgAjqYhjS25CbZ+5A0r5yeXeCyjuBY1WkemCRaW67J6 QFQlxJ11GbUC++qVMurcoYODXgC44LkHTxmcyjFZiHdLA3hbB0WziwChxXVfVplsK0TtXl S30KuohC2e57VrdhjXEqPPiRLkFx8llIT0unBJmasfOdhYZWyew5e+C+qFjO2ADfwAFe0+ Xd2TKkUJczz1vId4/qYZjinBsvmie1iNtOaA+z/EwgSiAX/4eiIFHvDx+aaMeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774614851; a=rsa-sha256; cv=none; b=p2ZfqGHqJSOqML1ywYJ6sFIFLKpxmRVYehhQ9VkOXdobpjHLpx2K5Qa7xhC3IWuA9/IT8f uZmMEVbaUgxypzDq1svQJPt6oCDGtEfr/7hAdBGBB9vQ0CjtnBWsap2VAq/cEn+dNCBvTn FF2ggYY5GxvQFNnKvj6RjJALiJ1eDLRwgeoygMS/a3gJHpdk1muF2t5I5blOIM+2FCkM8J czVQybLdyuPS/vmWdRCEW7ZNHfm9HuyXYaa7ZBuf1XiGH2+fs8RgeWjNExOVqdNlsYBscF ED2VoVfnW/qNk4Ov6+YF05Ct1vSbfngi9maeKxBFdiNMDM50DuNF5YplOJCuzQ== 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=1774614851; 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=LO/cidVo3g5n9XLwysQ8+CBgVYLSX2sU1QUut5A4cPU=; b=YCFPTfDAU8D9+QhT2QJ8YcjkzNb9lE78v09Ono1n4kXgr6NEoNKVRRn2BJQjQj1w7C+n7J LXiD+IGlucwn9PruEF533OWwcmzAiRAvAEPtrNNnlSXD9gqihCXyQ/yJdlSK3BMlFCpL9K gL46fdHI/fBXxPBQo6uIrVawMxFlD8JAuw3/wEQoO4YkF/E70rtkeSX6V4Teus1s3Hf38e GR8l3LlxgnnB8hyqs3/Z4CMnkmy3HkXIyqi5OneNrPcUXji7IvZEnAtW6hbrFrHj/3j7K9 kaALxNYFX0g87iD1nULEGYc8E9gGAqvcZ0RvTlvN6J0R04xqrBIr3M2EBab4Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fj0Sg3fZFzg4n for ; Fri, 27 Mar 2026 12:34:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42105 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Mar 2026 12:34:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 97934f737548 - stable/14 - Revert superfluous mis-MFC of "Add ASMC_DEBUG make option" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 97934f737548d1979aadd4acc54cc4de88d05dd2 Auto-Submitted: auto-generated Date: Fri, 27 Mar 2026 12:34:11 +0000 Message-Id: <69c67943.42105.41ba77e6@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=97934f737548d1979aadd4acc54cc4de88d05dd2 commit 97934f737548d1979aadd4acc54cc4de88d05dd2 Author: Olivier Certner AuthorDate: 2026-03-27 08:46:51 +0000 Commit: Olivier Certner CommitDate: 2026-03-27 11:14:19 +0000 Revert superfluous mis-MFC of "Add ASMC_DEBUG make option" Revert commit 12e1ab887d58 ("Add ASMC_DEBUG make option, 2026-01-04"), as the original commit it intended to MFC has already been MFCed as ab3eaa6ea29d846d on 2026/02/22 (UTC). The reverted commit introduced some (superfluous) duplicate lines and an unrelated change. This is a direct commit to stable/14. Fixes: 12e1ab887d58 ("Add ASMC_DEBUG make option, 2026-01-04") Sponsored by: The FreeBSD Foundation --- sys/amd64/conf/NOTES | 4 ---- sys/conf/options.amd64 | 3 --- 2 files changed, 7 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 9640a7a59766..5599f0503887 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -114,10 +114,6 @@ options EFIRT device asmc options ASMC_DEBUG # Enable asmc(4)-specific debug logic. -# Apple System Management Controller (SMC) -device asmc -options ASMC_DEBUG # Enable asmc(4)-specific debug logic. - # # Intel QuickAssist driver with OpenCrypto support # diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index a3a735731438..c7c1f4da2a4a 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -66,8 +66,5 @@ NO_LEGACY_PCIB opt_cpu.h # Compatibility with Linux MP table bugs. MPTABLE_LINUX_BUG_COMPAT -# x86 specific uart options -UART_NS8250_EARLY_PORT opt_uart.h - # Enable asmc(4)-specific debug logic. ASMC_DEBUG opt_asmc.h