From nobody Thu Oct 22 17:32:14 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 4j9YB62wVGz6xPCf for ; Thu, 22 Oct 2026 17:32: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j9YB618Bdz3H7p for ; Thu, 22 Oct 2026 17:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690334; 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=LaLauCRqCjkELV+JNYqCi+aOymRnq1d2Ywusi8t5OjA=; b=eFcTq8YYSgF4W6WoENGrWJiVGwm8NYy/b26GZIbLrH3Z4CMGWfziNGGP38DYz9llay1w+o aESPRKktYThk4lesTUFtIYfI9CUhcM7gruBxeKtkVHYZKXp05tofsd1YU2XKZq29ar9V6B dDEtYxLfkO7bJQv8X3Z5MnSrjuE9VgHfwLAsW57jydRmva/Z7xHIn9NarRQoQo7BbfSegl iNEdsOIDwYguqKVK+UkvJtpRVD4DjviaVkRD/ndV8xlxx6tJn1d1ctdfpl2ii52GCawg+n JvxJQBRdsiyZ9r4IMzH6xlUcKuVx+UyCokI/xyj8VftyONd2BSEV35c9bvaz1w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690334; b=jvtLe0K5pzE7Iwyd4kKPvQ8abkAYBR3aes8uRlDgJiyErPnUl85qFBgEJuEVOH28xkZjG4 7dXAHR8I+aALuLqsv242vlUtRcLbjjUfxUk87TyMX2BmmS3NJmMobCEfXW3H41+6YtjKLC H4ZWm5T4y6dAnd2Q/iQb1A4jAfDnLbVasfR66HvI67Yd5gff4pPSy6peoXS93kKAWt0f45 9NNfNOKQHWCE5usq8YFXV7L9ePLbRu4u9Roj4zsIUzFDHPcCb01Q0EGhw99/WmwlK25Z/j lEdYQ1k85dS/S3x3iyj3XkB1CK4KSpJ+xzfj8eSnIixhUT/EPoJPx/ulNvpVGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690334; 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=LaLauCRqCjkELV+JNYqCi+aOymRnq1d2Ywusi8t5OjA=; b=Uxk0plww6L6C0nO/iCfR5hPJ+gZPiqq4DtM8RHcTRGtkJawgvobnsHiQwEFwRJ0Q2xpZeS LFl133pEKYKvaEfewdLtWLoglNnbQvxiPj4emOyInBGN/aVwFH6j2noXdGrMBoQPFaOHTk zqxTMGEmgoVOyvNTZBl1zi780QrDqeBF6s1zhq7/ejboGHtJ/XrfhrdgRJKQ1sQK8zbRa6 WVs/yjvyPi9P43ceIZdyXMsXP8uwlOK5JXo/VHXhFisp/zwrRCzDE+Hvz7odfc0CofPIyx NImMLSg4bJP1F8ma7mOHiyX9iINtRTBIhkbvk1KgyxJ54UEUOaMFexLduHn/yQ== 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 4j9YB60g6Wzrnb for ; Thu, 22 Oct 2026 17:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d74a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:32:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 56280cd297b7 - stable/15 - amd64: Revert an unintended change to GENERIC List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 56280cd297b784cabaa224a20b98ad3b8780f546 Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:32:14 +0000 Message-Id: <6ada489e.3d74a.19187eeb@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=56280cd297b784cabaa224a20b98ad3b8780f546 commit 56280cd297b784cabaa224a20b98ad3b8780f546 Author: Mark Johnston AuthorDate: 2026-09-29 23:11:53 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:41 +0000 amd64: Revert an unintended change to GENERIC Fixes: 767cd9bb4200 ("vm_swapout: Fix the build without options RACCT") (cherry picked from commit ec8b68ba8a4ad3b020805322f7c676869978a480) --- 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 106f171a93dc..e06c585318b6 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.