diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-09-29 23:21:44 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-09-29 23:41:51 +0000 |
| commit | f7a5903de272db58b2b9164c1219fc2d5b757654 (patch) | |
| tree | b404ea19dcd9209bbaec51afef88c8349004002d /sys/modules/zfs | |
| parent | e47381c9fc72c16e063da71fb32191e402948a50 (diff) | |
| parent | e13538856479ff79ca6642e53dddf8a593deb2c9 (diff) | |
zfs: merge openzfs/zfs@e13538856
Notable upstream pull request merges:
#15308 5551dcd76 Don't allocate from new metaslabs
#15312 ba769ea35 Fix ENOSPC for extended quota
#15321 e13538856 Restrict short block cloning requests
#15324 f9c39dc86 Tweak rebuild in-flight hard limit
Obtained from: OpenZFS
OpenZFS commit: e13538856479ff79ca6642e53dddf8a593deb2c9
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 1accbe621d17..b77a32e4754c 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1110,7 +1110,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g2e2a46e0a" +#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_ge13538856" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1140,7 +1140,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g2e2a46e0a" +#define ZFS_META_RELEASE "FreeBSD_ge13538856" /* 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 d3eeaf9d098c..d3c3225a609c 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-110-g2e2a46e0a" +#define ZFS_META_GITREV "zfs-2.2.99-118-ge13538856" |