From nobody Mon Dec 15 18:18:36 2025 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 4dVSx85HvPz6L7T6 for ; Mon, 15 Dec 2025 18:18:36 +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 4dVSx8191sz4LBR for ; Mon, 15 Dec 2025 18:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822716; 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=t8QmxsdthtX0MOuJsNwSoPe3/oWjJqPdMfC5qr6yGHo=; b=xiHL17ZeVnbr5FpOUxCpGqMXDMivBaV8VyjueNXVTwj3NwTKV20pHWC9nf1EwH5535Td1/ 3kOFN6HSMrsIaeUacH7Z+vYjltIqJUpMFUE/fdaWBT7z1XmoBoI4GGXUIr3dAxlpZMaFS3 cHBv2CXR+mWHJti7tEDUHQ1yqKKVnGHM1aSPxbElByuCSZZ8hNq9QUyA5Cp6WnaWqb7zGs RzpPySwIdR6CEXR6d+0wFKI1RvVx7k3q0WlfHwUxnWpmoWpOmOCTqWJ6Ajh28XwaeEpFhb ZEMQTo7iUidc6KDkw60pCuSO8vjTrXfNWVozQDFIfnECBXKn5A72JzQJ6XAeWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822716; 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=t8QmxsdthtX0MOuJsNwSoPe3/oWjJqPdMfC5qr6yGHo=; b=R5CjV5BrQ6UOvQ8ErFzIxAIlHfTKTWDc69btn9MQHWSHKT6gQYB/FSVN7dmyTxjrM4NGNb 1lmr6mioZACoNkA/cwE+tp4cdWvFE3e76jWO4+jUqxBXASU/jAsvrEn9/TZ3sTn9aGOmYB zUvivFIVRBhQdKPUNlpEyNYvDmErVZ1k53pypYJz+SubtFNRDuHWyBqtjKVi1kBjPpX+QG Q4Ce+d+jHAiiGS3oQzYtR1I/IhhX2s+Qzxm8t6KpqkYzTYJW+Eu4alQ1oV+7OhhPzYEVhC oJuzCsK4FyrrkybsbOkDmX6zTcf8Ep+5Gic//5ja4R/1//wnd7v/uX0mft4RjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822716; a=rsa-sha256; cv=none; b=JcZ4GXv/9LFY8GiRrxlKnTKOUybpVznLGrjWZj+g6eBKOT0CmFG9HUMB597L7ofgI+c6J4 z7jeQBpI5UvviMNWJl1Gi2M6Pg6GpopHTn0eZnsM9yUDk7eS9iBI5r4wypoDMnTPWlArjs 2dcD6G5dT4Z6i6vuOe7/lN52CX4U+nfszjnGL7ww24SM3EMXo8gEheXy7OEh/KVDkPeBHh v84To444L7FzbcnqUSEthA9ZxtJHDcSbmOjUG4B3s2+KeHJjD9tjzvEhZ77bP7Yx5TzJX0 v3t9t966bp7zHcWz5fewFCqZTxHKrNqTjyEqfw/ey1MdI44Y729vz0cwQup1Pw== 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 4dVSx80ctgzWn7 for ; Mon, 15 Dec 2025 18:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:18:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: db284e1732ef - stable/13 - Merge commit 88433e640ddb from upstream OpenZFS (by Jessica Clarke) 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db284e1732ef9a08438552ac8586c59e0ba42ac0 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:18:36 +0000 Message-Id: <694050fc.25a32.7015005e@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=db284e1732ef9a08438552ac8586c59e0ba42ac0 commit db284e1732ef9a08438552ac8586c59e0ba42ac0 Author: Jessica Clarke AuthorDate: 2024-09-11 17:01:06 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:35 +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 bb41aa34bee0..0826170bdae5 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 */