From nobody Mon Dec 15 17:00:09 2025 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 4dVRBd6LGsz6L1gB for ; Mon, 15 Dec 2025 17:00:09 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVRBd34YTz3pFJ for ; Mon, 15 Dec 2025 17:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818009; 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=jyJMB8pV3daSwmr3eTaLRvHlxAg2NEuKGdSDZTQh9AI=; b=UZ2BBrZx6FyaCBztaeKFY9yT3ir7XEWD3kQHYlRZUgXJxAv+d4Yecg1LMHPfQVWHsaXEad vTedqz22Nh2Bkt0bDJxbVP/5MlXdRZcUYxD/urt/RZHZv3SiBikPEZu4eTzsRncvLdYI38 +3LV1FG2nOb/JhK+qpYlRz69WJg5o+bDieheQr1zFHMOM9W88fMWWCvvZv0GhRYu0qsRRc l9Vg+R2L1nzBN7OvIfxDYxth0Sp9dt1YMGhBjr1hyi1ewFG7PxbG45IB5tD+pW1WM8UT8v VfpqXpUwbpG53rHvbA0BsyxOdROCcg7dBofoqdsDt1ZojGY7AyTCzNLFoOykeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818009; 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=jyJMB8pV3daSwmr3eTaLRvHlxAg2NEuKGdSDZTQh9AI=; b=fBJmeF/69djMyb2QPHK+ammMiFezHkzZUDjCuFq1wSqx46bYLE78wBTr0c5DyqeJtzFrt9 8RzNG4JtVMs8Wb8EgTwvOg/8TgJNy+MD0+KWBEb9Z155tp3f3oX8EcByEB7lblXN+wb7hO yDpUPUjsvK8k3zY5Me2fNb7NnlMPWBF0KrNym0UiSjSm4P27x7ZCYae7yTRC6k+68lsjBp 2TT34B/upyrumlNBBBZwTAnaJlVqXNBgwoB4LDWjmvcfTvrsKgYN302sK3bYwtTRrKreMM 6VitXf+2jPf2AGIGyZak6tHpV3go3csg5/y0Z14aSfveGTc27AWkuqxjIFlZuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818009; a=rsa-sha256; cv=none; b=n8DljmHFAH1u+zbTQQM6gABFzykT962OYnTouQ75x70k1GZzWOjKnbyRNFP4ybxs9F8m06 Ohhbu2jaOby2D8AQD7HmPH9d+R6dbwQ0UBQ+SR0pNj1NurNCm2FNEyPjRehaLJ5fXiq7+O o39hJt1R68YoxK0NXq2kir1ihHih+EOEcXS9NI3nn9NftUTQBlvUmgoz8nVkkpC5SCTDjC 36j6W1/QD3F3pMv5jfqg15aN+NaHjn+KJHWhEgO0ZzhB+yCAUiv98CM/f8RdhVazToY5s0 yAOsZJ/mGenrR17iPJRthoNAG5dPsdXepwiFR5g49EmWJ/r8XGlfNeKT/HwE0g== 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 4dVRBd2WpKzCWB for ; Mon, 15 Dec 2025 17:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b0fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: f6578a0ec7cb - stable/14 - Merge commit 88433e640ddb 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6578a0ec7cb954059da580c22dee5bc331ee68a Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:09 +0000 Message-Id: <69403e99.b0fc.70cb0d03@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f6578a0ec7cb954059da580c22dee5bc331ee68a commit f6578a0ec7cb954059da580c22dee5bc331ee68a Author: Jessica Clarke AuthorDate: 2024-09-11 17:01:06 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 16:58:43 +0000 Merge commit 88433e640ddb from upstream OpenZFS (by Jessica Clarke) sys/types32.h: Remove struct timeval32 from libspl's header (#16491) macOS Sequoia's sys/sockio.h, as included by various bootstrap tools whilst building FreeBSD, has started to include net/if.h, which then includes sys/_types/_timeval32.h and provide a conflicting definition for struct timeval32. Since this type is entirely unused within OpenZFS, simply delete the type rather than adding in some kind of OS detection. This fixes building FreeBSD on macOS Sequoia (Beta). Signed-off-by: Jessica Clarke Reviewed-by: Rob Norris Reviewed-by: Alexander Motin Reviewed-by: Tony Hutter MFC after: 1 week (cherry picked from commit 796c6031cde6dfdd92b4d178792fc0534bf788c5) --- sys/contrib/openzfs/lib/libspl/include/sys/types32.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h index eadc67c7122a..d065ebed03b7 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h @@ -65,11 +65,6 @@ typedef int32_t ssize32_t; typedef int32_t time32_t; typedef int32_t clock32_t; -struct timeval32 { - time32_t tv_sec; /* seconds */ - int32_t tv_usec; /* and microseconds */ -}; - typedef struct timespec32 { time32_t tv_sec; /* seconds */ int32_t tv_nsec; /* and nanoseconds */