From nobody Wed Nov 19 21:44:31 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 4dBZkm1VpYz6JKCl for ; Wed, 19 Nov 2025 21:44:32 +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 4dBZkm0Prwz3CJv for ; Wed, 19 Nov 2025 21:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588672; 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=FHtW8NJtFy7+Tw4sR8O+g7+xj59mWKPLHfapSIaaRxY=; b=ISDpJuvkBxXHOVEixs9rkluvk4wO8+KEQpCgPwB/BRWUXE4ZEhPbbXejA+BTiGZAcKuUty Sg9DtcNJaceL9i3FZdv3jg/mef/TwN6aaO/iIk5iqIC4So1fUrNMLYem45LX+lsMVxu0eL YM4fywYEcH3mmg0oEUJQTdvr13LNoQdQnd+YGt6Y5y9uBYF6KWTS8lERNtmAKgjPcDxRWK dNEQz8jFNUSiufXPSR6bqVRx3UcCdsak6SNikj0hNsjMUy8hdmwozdWzMi3HMqxw/Ba0pH 6I5uPQHwdKcVU+IgxBRjLVNmCcrx7HmT2e2ytfHvU3v4109wGgl2L0xl+kE4+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588672; 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=FHtW8NJtFy7+Tw4sR8O+g7+xj59mWKPLHfapSIaaRxY=; b=U7hLgwj9nGUG2OFawcp0tq6S9RHXFQK2COs/KwuhiPO3/VQS9B01HKlO2iLrpTlx0qfq4L hxCPc2ZcdnN29kSLLNYaiQ7eFQu0Z1W1RVzkNGQPIGhjq9RrrGYAGS9bFd+emhJPgb2MWL HAYezSMUcgIbJ0wOYkgDkSXgD68TzThOTfgxCUQwgED6lIqFOFNGCQmlXpCChIhHKCZZVd 4beor5N6bCeFTHn0pBTod6X5ojabETdRu4sH22Fqeq2eqLHmipFw7TGAOfVWO7kapci9io I52DTRqlAFS3sqjOM2fmaUokZNP7jburFjsQ6SxnzF4mjaane3TGFSvruTnP2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588672; a=rsa-sha256; cv=none; b=FgNl9AJRFQMevvneTSjeNjUX5k33tD6R6oMRMNPZmpZ4oQq1E0KIxF1QBgD4TRsPiUBeuN fu4syT30iDYEoNHIfgy2Hghh8H4AblMk6i8uQGL3yhAENl87/jgdpRZs4ppyEnQzrgKeHY L+Yk7/i5iiP0APUJbUbmZLMmOzY1Z8BljCVFdOGGNICf/jh6ZVmmJPhJrPFVjoBldBU4Kc yUQIMKE/0cl+5SIuRmZiodvDFVgTMHs/jOjBqYg3hJ06vYvbssH8YiLow82m5WLS7JuTWH gQ4vrqA7B4v6k0hlqkHugzx2xgOgIf9iu93M1nASVgTxbs0KVlWv4nR6FWxD2A== 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 4dBZkl63ljzy17 for ; Wed, 19 Nov 2025 21:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33432 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: d10ce383bc19 - releng/15.0 - zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 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/15.0 X-Git-Reftype: branch X-Git-Commit: d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:31 +0000 Message-Id: <691e3a3f.33432.6cc34927@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 commit d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 Author: Martin Matuska AuthorDate: 2025-11-18 11:58:55 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:59 +0000 zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 While here, fix compilation be unhiding zfs_tunables hidden in 5714090fb Approved by: re (cperciva) (cherry picked from commit 7128544353ac76cf0acfd02b327dec8e8f7faf1d) --- sys/contrib/openzfs/lib/libspl/include/sys/tunables.h | 3 ++- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h index c85400f6fd28..0ce348669bfe 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h @@ -25,7 +25,8 @@ */ #ifndef _SYS_TUNABLES_H -#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +//#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +#define _SYS_TUNABLES_H extern typedef enum { ZFS_TUNABLE_TYPE_INT, diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 339182042915..446c5c1a12cd 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -856,7 +856,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.0-rc3-FreeBSD_g814f9afba" +#define ZFS_META_ALIAS "zfs-2.4.0-rc4-FreeBSD_g099f69ff5" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -886,7 +886,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "rc3-FreeBSD_g814f9afba" +#define ZFS_META_RELEASE "rc4-FreeBSD_g099f69ff5" /* Define the project version. */ #define ZFS_META_VERSION "2.4.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index ba87aecc9751..cedd706372c4 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.0-rc3-0-g814f9afba" +#define ZFS_META_GITREV "zfs-2.4.0-rc4-0-g099f69ff5"