Date: Wed, 19 Nov 2025 21:44:31 +0000 From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska <mm@FreeBSD.org> Subject: git: d10ce383bc19 - releng/15.0 - zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 Message-ID: <691e3a3f.33432.6cc34927@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 commit d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2025-11-18 11:58:55 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> 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"help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?691e3a3f.33432.6cc34927>