From nobody Tue Sep 29 23:13:08 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 4hvYrB0pbwz6swcX for ; Tue, 29 Sep 2026 23:13:14 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvYr970syz3QVd for ; Tue, 29 Sep 2026 23:13:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790723594; 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=xm92CFIl/W4T4vEjWw+U9hwgWYstglUhQexAKa9R5No=; b=e5JdTLAVOxqH+d4kLUrBVbhON2v3UZxfPJmwKJjJ5jTTbbg35zQGhWs544eJWxarSDTfRK 2zJOEbMWbSs2B6OsaouecII6fv4c8zW4Z9Kp06mnfF9ZZ2A+IlH93u67qit82Ri5FRAz6j oO+QMYu8dBNjH98Hn4ct6S8/iJKiuMcwDjYE55dlaK+/hez+u/mycjO4GH3nzrTuHCLJG6 +jRmWcLnoJUsBJjM9kUSOrfSndTuaTWCTrzjmwonL9WOEixtiqtU9V3UdpLLOhPTVmRoG9 1pRU/BkkxIxY+aR82T9wjLhkDlOnVLoyNuHSU4LgBfy8d5QQSrhSAtssRKZUXQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790723594; b=PaGlWpI0o6pxy5WgOxB+A7/DArw8oXSOV1xl/SCnLalRysSuu/wHOQ4oNLA1xu5+R6dAC/ HBr7O3aRWrgNJQg1Kf5km7aHs3G/DbXZaFhITw1A/IF4WYH12gd/1AQrZps94UCKNRYk/Q 3y80t8TYECBxJ/TKvBfOqPKMkWrgCcHFZKofmGwGqDAtWwKGR2j10H+lqZ5XG8uztJ0//u E9ZM87lg+dbq2JSiAIyyFqUkSwyFB1w0BXeFJopuxjtCWntyeljIj03M743dS5S+BFSrw2 MqS1EY1CV7lB50mTLWPwb7mfXPfmCUh/vqx5s5amf+Ew6/NMibcU7zD00H+N0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790723594; 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=xm92CFIl/W4T4vEjWw+U9hwgWYstglUhQexAKa9R5No=; b=F07TyKRv3WxFM7o1S70To2s29i1k/6vvZXJdSSgDt+x8TPmdFVAWMLReumD9GE5ugDILL3 YOiOG0v+6wYnB/lDjNff/wVLFhfnW59+HXCkm0HeqesJqNRfSbuAh0xZ5+6TUOyHP8yN2i /aeOzHX7aJfKri3/aJ8X+tx++Rr/46csAy477FYGvCF+hTp3ljuWw7AH3mH1IkYTjvV8tJ Bkrjhrd1hFCmetp1l1tsTa0pha34V6GcTl6oyi+C8V/cYMp63NakgkULEaMUtNR/73Auxl u5sKhFXDriW2JcA4gA57FhgiWXBl/s0Is4GyM9LUYr0y4Oz/L+Ecb58p7ry1rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hvYr964g3zKFc for ; Tue, 29 Sep 2026 23:13:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 393d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 23:13:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ec8b68ba8a4a - main - amd64: Revert an unintended change to GENERIC 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec8b68ba8a4ad3b020805322f7c676869978a480 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 23:13:08 +0000 Message-Id: <6abc4604.393d3.7d00a779@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ec8b68ba8a4ad3b020805322f7c676869978a480 commit ec8b68ba8a4ad3b020805322f7c676869978a480 Author: Mark Johnston AuthorDate: 2026-09-29 23:11:53 +0000 Commit: Mark Johnston CommitDate: 2026-09-29 23:11:53 +0000 amd64: Revert an unintended change to GENERIC Fixes: 767cd9bb4200 ("vm_swapout: Fix the build without options RACCT") --- sys/amd64/conf/GENERIC | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index ed0b854d1766..61533394a3d0 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -89,9 +89,9 @@ options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data options INCLUDE_CONFIG_FILE # Include this file in kernel -#options RACCT # Resource accounting framework -#ptions RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default -#options RCTL # Resource limits +options RACCT # Resource accounting framework +options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default +options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support.