From nobody Tue Nov 18 12:58:53 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 4d9l6j5ln4z6H5d1 for ; Tue, 18 Nov 2025 12:58:53 +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 4d9l6j3rq4z3gmS for ; Tue, 18 Nov 2025 12:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470733; 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=s3IUofgEmudH20Qgg0cQtPIhPCi7/zS/xdmrO0rfFsQ=; b=aWE8qw/mUT5Ay9hQjhzdl2DNgtNl3WypLdUcMRjyDGJw/TNQ+wDclp/zACOc+kUeXe0r9o VqY9yZu0FMdHdrPyAQP123/OIGqKIvBTmmUuLFNO0tZo1sPJIsCCy51bvIEzPsLx3Aqtu3 ka6Y2X4KYVmqG43cgxgLUJpaO+6GEUS3BX5OvY69lszHE0fH9FkL24UWZ7/vAgzBmo3DfX o7u+yCwWvLz5U7HX5e4k3kIGSSHoL1iTrQRH6LWjqDrA1imMrigdmY50byrEYeDWzpKZ8d iMVCpotuUSgjCg9kKyO8vtasO7r5zAQPNX2JIgnXjK0OtX7pTrsGYKYmEk/cUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470733; 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=s3IUofgEmudH20Qgg0cQtPIhPCi7/zS/xdmrO0rfFsQ=; b=yZkBT7lwZDPeSktSPNbIHWfch3Cp+sRXGMf7otla2CEqHOK7hUh6od83ZfsdeA+pbjcqY/ GbAZDhdXcxrcd6MX7N401lkCIEw56b9Btnry9DSfTELEeohYeJ4ISemlq2fqZ4dKwvSkP9 vSKDb8+cTURP9z1ANwikintqcseZSDxBllGI4Q1YoyRAbSl7V3ZaDoLIPvGj7EqdgjvUBw pzWXjjm+70pr7qrLvJZnxL/BCmcDEEcCIMwQwENRedCGGtncFNFo9avfMIqytB1VZ8Qh+4 daIIexu8Y+lLaSWf2rbUNCxCbvMUQYwDsK2LqIKtDJBUU5cyW+vW0ejiNQ/FPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763470733; a=rsa-sha256; cv=none; b=cD2fwq/1I778CdvrtF7Qwh2qOl4p8GH8K9H8xyTzXcF7JVzCj2T1U75b0DgT/BgSTmMBBB hIvhtMxYee80Trp4bLwnOo8aJRVeubN4u39UvwWu3GizPwRxh9/P82F/ArTBK1WSM6v4Ox c0B/VOGWd8PBa3UIi5fq/Tf6+nTvmGm6fy5o25xwhRrx48i8uhC7XJlVCTZYzcGQD+fBVW sUcclfWIKtSAifNHnDJ2L8IJogPv9gkj1kL7xBH+tDGKJwDg75S/paXnutnKahSn2+U4gC ZGsCIIDByLSudGGBSy4m0Kj5moC51Q8HREp6JAZtKpHnOjIK8NnpWNspg7D6Hg== 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 4d9l6j3GZnzvl7 for ; Tue, 18 Nov 2025 12:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2acb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 12:58:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 7128544353ac - stable/15 - 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7128544353ac76cf0acfd02b327dec8e8f7faf1d Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 12:58:53 +0000 Message-Id: <691c6d8d.2acb3.52f91885@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7128544353ac76cf0acfd02b327dec8e8f7faf1d commit 7128544353ac76cf0acfd02b327dec8e8f7faf1d Author: Martin Matuska AuthorDate: 2025-11-18 11:58:55 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 12:06:40 +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 --- 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"