From nobody Wed May 27 08:48:06 2026 X-Original-To: dev-commits-src-main@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 4gQNYg0v2Gz6ffZm for ; Wed, 27 May 2026 08:48:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQNYf3K6pz3TY5 for ; Wed, 27 May 2026 08:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779871686; 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=5Bn/IYHDVnxVsJ8Elbxv/0M8l8BD0+B0LBLrGYeuPgk=; b=LNkvUYXA5ggIiLTlwndt5DowfAWdi9Q/0JHSi2U2cfdCW/o9KGLBsPNCStNESI6fSkW38K SD+koZJD0GXhIjQjVfanSzPfGdaT8fpivJSLSNW4oIL8PtUk91QIz9pA969LZ/7acIcIB3 yIg8tPbcIFpbwNFJyjVKhFq3TtETeJvVURe1mx+3vb2SIqo3Mp8AbfcmtOWj4MuvTD9AS7 Rn/wTTyLvbWgQ+qnt6eVo9747vdDFKsEsowycIIn4g5dq4uCX3RMFSq3Ourw8TcX16ICiq 5J39A1RLBkoX2y3gx0gRI6Gc8x08xzA8ALmgQDuDx4FdsTnxd0tQw0mhA8aSJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779871686; a=rsa-sha256; cv=none; b=fHiC24FwI+DRsRdJKMLovFI60cB6XdG2RHGRwh2/+bkKcM+FL5BsQk0qcYMP02ygUFUknt b55Wbu0t4hrGjBAKSkCkZdXnDmxe7/3tBBRtkBZMKIWIEtspJucLyAL9r03JBJ43L7nGlH fbX2zQgurhwVReeNPox8mI6oJaejZpdSZawgEet74N5OhsRCjazJfFZ+dhQwrli1Pr30xX T187Xpxkdzf7HJd2KzA0W8Uyz8a6VPbAucEv7MraL6G07kIR6dqOlbV+x9fT8gwhCPF+iI OKGm9Q6qy0xhcbhdcdjt0hRpx2vXzAwdf21rRQYM+TaHuFBh+WcLCoxehOjlFw== 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=1779871686; 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=5Bn/IYHDVnxVsJ8Elbxv/0M8l8BD0+B0LBLrGYeuPgk=; b=jJvbgZC5WPDXfTdodn14XHNXA89eRW5H8MLvTkaz0Epdi8N1IuotHhGZ+GFQz2TZj6CANk Asm1M1+sgDyYMw0sA9PY6qWiHcG5ZBJ8a7hrjh863iUElavVM1bv/DpCXzbzRGKGC/BTvz RTDH1NnZGGlzDEit9NyKphfwnVk1JWvi4UWh3CghrvcAzB1CHayPjRGVWUQ06G53YlQc4n KbahAQOguhLdDqdFqZaUovoVwOWuuXgGwBVnMZWe7Ybrlxzc04FnpqMTLKeQ1mUmMnl2A6 0RWZLbxpMhm07+79uanUTMYtCYx3SHQ2HCe23eX/hvpcxrWZJTXt0OMyzAqWBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQNYf2ZYRzrGK for ; Wed, 27 May 2026 08:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ab2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 08:48:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 7a11a6c64d4f - main - acpi: Update mentions of s2idle in comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a11a6c64d4f52f41e63e535605d4187650c3651 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 08:48:06 +0000 Message-Id: <6a16afc6.23ab2.79e4ade0@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=7a11a6c64d4f52f41e63e535605d4187650c3651 commit 7a11a6c64d4f52f41e63e535605d4187650c3651 Author: Aymeric Wibo AuthorDate: 2026-05-27 08:47:12 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-27 08:47:14 +0000 acpi: Update mentions of s2idle in comments We use the explicit "suspend-to-idle" name now. Sponsored by: The FreeBSD Foundation --- sys/compat/linuxkpi/common/src/linux_acpi.c | 2 +- sys/dev/acpi_support/acpi_ibm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index 85a3afe5d01d..680d111d0194 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -126,7 +126,7 @@ linux_handle_power_suspend_event(void *arg __unused, enum power_stype stype) /* * XXX: obiwac Not 100% sure this is correct, but * acpi_target_sleep_state does seem to be set to - * ACPI_STATE_S3 during s2idle on Linux. + * ACPI_STATE_S3 during suspend-to-idle (aka s2idle) on Linux. */ linux_acpi_target_sleep_state = ACPI_STATE_S3; pm_suspend_target_state = PM_SUSPEND_TO_IDLE; diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index 693d793532c1..a5c44b1f81b9 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -1449,8 +1449,8 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg) switch (arg) { /* * XXX "Suspend-to-RAM" here is as opposed to suspend-to-disk, but it is - * fine if our suspend sleep state transition request puts us in s2idle - * instead of suspend-to-RAM. + * fine if our suspend sleep state transition request puts us in + * suspend-to-idle instead of actual suspend-to-RAM. */ case IBM_EVENT_SUSPEND_TO_RAM: (void)power_pm_suspend(POWER_TRANSITION_SUSPEND);