diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-01-24 11:41:22 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-01-24 11:41:51 +0000 |
| commit | fedf5b965fd623957a9b851418ba3301ac122e27 (patch) | |
| tree | 7781432253da8b1d6dc35eb9a3b8842f51945b25 /sys/modules/zfs | |
| parent | 95bf75895ddcf17402b1f69dce26cb821c922476 (diff) | |
| parent | a4bf6baaeb70a01a4c13fd6139ebdc97bad172e9 (diff) | |
zfs: merge openzfs/zfs@a4bf6baae
Notable upstream pull request merges:
#15630 a4bf6baae FreeBSD: Fix file descriptor leak on pool import
#15780 d9cb42da9 FreeBSD: Fix bootstrapping tools under Linux/musl
Obtained from: OpenZFS
OpenZFS commit: a4bf6baaeb70a01a4c13fd6139ebdc97bad172e9
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 70eea47ba127..f248e896babb 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1137,7 +1137,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-310-FreeBSD_ga0b2a93c4" +#define ZFS_META_ALIAS "zfs-2.2.99-313-FreeBSD_ga4bf6baae" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1167,7 +1167,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "310_FreeBSD-ga0b2a93c4" +#define ZFS_META_RELEASE "313-FreeBSD_ga4bf6baae" /* Define the project version. */ #define ZFS_META_VERSION "2.2.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 95aaf9e57f95..55e68d933978 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.99-310-ga0b2a93c4" +#define ZFS_META_GITREV "zfs-2.2.99-313-ga4bf6baae" |