diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2025-01-27 07:21:29 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2025-01-27 07:22:28 +0000 |
| commit | c6767dc1f236f20eecd75790afd42829345153da (patch) | |
| tree | bc333964b865770e98c27b0c3e380cd3cc1e8b1b /sys/modules/zfs | |
| parent | 0eacc5c4332176b63d665f91f73f8be4a4294afb (diff) | |
| parent | 34205715e1544d343f9a64149b17c371282306ae (diff) | |
zfs: merge openzfs/zfs@34205715e
Notable upstream pull request merges:
#16938 2aa3fbe76 zinject: count matches and injections for each handler
#16947 -multiple zinject: add "probe" device injection type
#16976 34205715e FreeBSD: Add setting of the VFCF_FILEREV flag
Obtained from: OpenZFS
OpenZFS commit: 34205715e1544d343f9a64149b17c371282306ae
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 4 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index afd68fc026d4..b6cb1ab0652e 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -787,7 +787,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.3.99-158-FreeBSD_gfae4c664a" +#define ZFS_META_ALIAS "zfs-2.3.99-170-FreeBSD_g34205715e" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -817,7 +817,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "158-FreeBSD_gfae4c664a" +#define ZFS_META_RELEASE "170-FreeBSD_g34205715e" /* Define the project version. */ #define ZFS_META_VERSION "2.3.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 990e0f51e04f..0a2a21e6ddf1 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.3.99-158-gfae4c664a" +#define ZFS_META_GITREV "zfs-2.3.99-170-g34205715e" |