diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-11-09 10:42:33 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-11-09 12:19:17 +0000 |
| commit | e716630d4cf89e69ec3f675ebfceee09f1a85e05 (patch) | |
| tree | 3ee825a5671f470e1481d24312b58895a12d01ac /sys/modules/zfs | |
| parent | f5b3e686292b6502878c64c3c154908024e06eb6 (diff) | |
| parent | 887a3c533b94a4b70075e310f15c45b9dee19410 (diff) | |
zfs: merge openzfs/zfs@887a3c533
Notable upstream pull request merges:
#15022 5caeef02f RAID-Z expansion feature
#15457 887a3c533 Increase L2ARC write rate and headroom
#15504 1c1be60fa Unbreak FreeBSD world build after 3bd4df384
Obtained from: OpenZFS
OpenZFS commit: 887a3c533b94a4b70075e310f15c45b9dee19410
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 dd1a926d286c..686ab2e3f80d 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-197-FreeBSD_g9198de8f1" +#define ZFS_META_ALIAS "zfs-2.2.99-202-FreeBSD_g887a3c533" /* 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 "197-FreeBSD_g9198de8f1" +#define ZFS_META_RELEASE "202-FreeBSD_g887a3c533" /* 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 86525c162b79..d2aeef5edc18 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-197-g9198de8f1" +#define ZFS_META_GITREV "zfs-2.2.99-202-g887a3c533" |