From nobody Thu Feb 19 19:28:26 2026 X-Original-To: dev-commits-src-branches@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 4fH3MG4cGHz6SJlK for ; Thu, 19 Feb 2026 19:28:26 +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 4fH3MG3WdXz3Z27 for ; Thu, 19 Feb 2026 19:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529306; 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=aBMDX7rucI5YbcE5StJDHcCl0gpw54om/txKfXTuZZE=; b=IIU8idWsIvOsZ97gHEYrN+jnUqObDJ0VtpgDIphbooxcWSbqJe3fSZl6GdhrVVOUtYkM31 nVHoPrVNYKgvYBYmbbNrE7JhFBgUzlx+pkOjGQycvJpIMa1XxCrNvAtuTpWHY3PXMpSf7P /p+zYuPTnDeJiDan1gHzOYjxQkqU3IPxUEVw8b9He1eI/g8i1iff2SKVWtifZhXwVrExS9 snZjRIJ2QUbDBz5a3WiNIKfCXBaEqcco4RV1NNTwvHoDm0NrfokdQzfMuJtmcDc0F56cOT Nt1FLO7fU82if3W1sxkxHQc6Ygr45GTABi+vwUxAyes/7KzhxtRYkCIGaBgwQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529306; a=rsa-sha256; cv=none; b=XxASv6jgqEr2PQ/ZiBxYOGjHoMmKC1aAsQfRN3BT8cba8EsbExEl5a3lYRZ2yYuDZIGQM/ Ii2BuEuHozC6dWwbL7f4ptB/LcZI5djSonhd0V6Hq1CUyT9uZGFYk9YL2pcgKdaEu8zzR1 Oz/5BNsMIoG0K1U7erPqrpZc4VkEe1+mBQefSwqVF3kdepHBVaHEbbBhm1qWj6hnln1DTj 8WBBJaNtkIFdCIwf9VOw0lZI2cwWJLjkgZOXYER+1n/S645nAti7vpf0+fA+5aKSiJOr9r Jm6KLLvQaDx2q0Lx9TN6gVUlX8uaaBD1Brph2qQ+YcTfk8z/Qj7rSViaI7W2dA== 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=1771529306; 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=aBMDX7rucI5YbcE5StJDHcCl0gpw54om/txKfXTuZZE=; b=i/dxJfx6ddC7sJWhbqfGPKID2SaSlcDTjCPNZ1dCi7DN/VyWEePLgBZ3THEw08UV1ERir8 WS+5HcLFxjIjGhaw8qnPvyYC+xoVboaRzjVPC62mpXuGGQ5olLMT+9TxgOhARcg11fGOoj nEXzawsHL1IUclZnYI2Lqw9nUlriRxxXbR2cNG4JzUWZUEhZpP7Zy9LNhGE25PRmxNAgmn feTIZQfBPxszmBn9wpdYtnRy/FqAG6dx7cd4mLBpt2YefPevqYI1ndFuapGprRanuY6uG7 36ET38BMz4TFywA/z6RkOFEptDEUFFN6w1PF9ZkNDcOO0Gxw9omRnSkRKEEUYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MG312dzw3b for ; Thu, 19 Feb 2026 19:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46480 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Colin Percival Subject: git: 0d08a243f21f - releng/14.4 - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 0d08a243f21fcdd6d1ed9cc198d887722910180c Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:26 +0000 Message-Id: <6997645a.46480.5a5ad34f@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0d08a243f21fcdd6d1ed9cc198d887722910180c commit 0d08a243f21fcdd6d1ed9cc198d887722910180c Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:21:28 +0000 Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break, which predates the addition of FreeBSD support to OpenZFS. Moreover, 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also defined (alongside __powerpc64__ to disambiguate), which has always had a 64-bit time_t. This code has therefore always been wrong for all PowerPC variants. Fix this by limiting the 32-bit case to just i386, which is the only architecture in FreeBSD to have a 32-bit time_t and not have broken ABI, due to its special legacy compatibility status. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Jessica Clarke Closes #18217 Closes #18218 Reported by: fuz MFC after: 1 day (cherry picked from commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05) (cherry picked from commit 354cc5e142634afbc967ede56572b939fbdb5d38) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h index fbc679aacf93..396bdd6ce8c6 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h @@ -52,7 +52,7 @@ extern int hz; typedef longlong_t hrtime_t; -#if defined(__i386__) || defined(__powerpc__) +#ifdef __i386__ #define TIMESPEC_OVERFLOW(ts) \ ((ts)->tv_sec < INT32_MIN || (ts)->tv_sec > INT32_MAX) #else