From nobody Sat Apr 25 16:43:02 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 4g2wcW5yHqz6bn1Q for ; Sat, 25 Apr 2026 16:43: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 4g2wcW51y6z3Dqj for ; Sat, 25 Apr 2026 16:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777135387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iReIGWlT6nyfzP3MGw2cCPkofCNcstcg16JwupTzvB0=; b=JVKDdNGgRjXYSJiEm5E5fgTQcPHKNV3ozLKYA2DN8QNWNTgnqto6xoRLaJwcRJrnwf9qYw 0IzwcH8IfXbXyYi2OPjPgtt21IhvpPCKslUGFhgGCsmacf+zETVHqUCj6sSTY0jhg88UeR znG+yoRb/6ym6Kn/JLAsOiLlA56TjPjfvqjPlpaonmYA7yS+Wo16IPPN3vDj22gWi5wcwH 2ml+xWgQ4lEG6qZ95xxpmb7VG2fYJ5XgfGGgYME6J6hMyj4bpwmMXLSbeRCiOtd5IDBImU Toi27tGtYkwx+igban/Bzxcusynwr7Q+Eygg7Yraqxku8HM2wQlhFJm2MOFnvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777135387; a=rsa-sha256; cv=none; b=jCUePO22ZNXEs+awlTy+6cgqo+RGSQoibMP9sxWGx3q/55f8xB71d9Ev+bYT2H29CGqL4x uJlhCoggKRh4YwTx9WgBhH7qv1fxHMR9iO8JHz3ygFq+VxQOCKTdFnlLeXerKJEJv8GtrY qM+2yMN+cH9hB0sgxjUNjvudlhXB0ayKhICq8X9ebWT4kfYxsqOLuWQSRM/HBZN8S+unzW GFGgKZG/f07U4BQyIkHWaWaEI92Ct5X82hNavOhk95l8vcqRZKYtP0M6NvYJmybSxb1cl/ 5KXTI92oTvbvZza8wQGLlmSqraabcHcsrYxMf8apZ0dpbqwKpp/JIwOvhqPwaA== 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=1777135387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iReIGWlT6nyfzP3MGw2cCPkofCNcstcg16JwupTzvB0=; b=CM97ApyiMUTSled8RDSSXCOZhxkuCDzAehQFe4TFReWb28FY7LG1SPQ7Qpg5TYwlnysoxe Vr1Dpq1AN5avUsi9YRrq+v9Dk47/cATrl8HX8KUu8bIaChoKpwTnbef05QKxsneo80/QQd 2oaTQcq02UzgdT0BB7q7J7Ug+qoXnEE6VwLhaB5MyjLbcND8a1sNRIoBa5pDKTDdDVKwGc VE1Ddb2CYILTuIhWxs/yLJsSi5D70lL7Z56X9eg6qR38KjIhnbeu5SCH9Qz96Aa7KAYusv swyedEbk3dToPjA4BStjd3wZ5GBuMeEZq764SHOqWFuwa+DfgY650QZ60y9npA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2wcW4STDzjY2 for ; Sat, 25 Apr 2026 16:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46311 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:43:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: tslight From: Enji Cooper Subject: git: a2c76430981f - stable/15 - use ASMC_FAN_FUNCS2 to avoid trying to read non-existent keys 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a2c76430981f50c553bc1fbd699fa30bd75e5eba Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:43:02 +0000 Message-Id: <69ecef16.46311.7e7ce743@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=a2c76430981f50c553bc1fbd699fa30bd75e5eba commit a2c76430981f50c553bc1fbd699fa30bd75e5eba Author: tslight AuthorDate: 2026-02-26 07:44:44 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:42:53 +0000 use ASMC_FAN_FUNCS2 to avoid trying to read non-existent keys Signed-off-by: tslight Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2051 (cherry picked from commit cecd12ac3b4d98bd52dc0e802a4a38bc72f50e2c) --- sys/dev/asmc/asmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 757f8d72e1b9..d680db49dfda 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -311,7 +311,7 @@ static const struct asmc_model asmc_models[] = { { "MacBookPro11,4", "Apple SMC MacBook Pro Retina Core i7 (mid 2015, 15-inch)", - ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, ASMC_MBP114_TEMPS, ASMC_MBP114_TEMPNAMES, ASMC_MBP114_TEMPDESCS },