diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-10-13 07:45:15 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-10-13 07:45:15 +0000 |
| commit | 23cf27db2cc4b0208a35b009f873971a7bb4a6bb (patch) | |
| tree | aa44840c1ab8c6b6626c7537cf2eca1fd23d30f0 /sys/modules/zfs | |
| parent | ab393e9548f8cc0ee28499c411963b798ebb38a5 (diff) | |
| parent | 8a740701283495e59944839bb2607f80907d950e (diff) | |
zfs: merge openzfs/zfs@8a7407012
Notable upstream pull request merges:
#15368 008baa091 FreeBSD: Reduce divergence from in-tree sources
#15371 1b310dfb1 DMU: Do not pre-read holes during write
#15395 8a7407012 Zpool can start allocating from metaslab before
TRIMs have completed
Obtained from: OpenZFS
OpenZFS commit: 8a740701283495e59944839bb2607f80907d950e
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 1990d5d99cb1..a41af071ec5d 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_g66b81b349" +#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g8a7407012" /* 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_g66b81b349" +#define ZFS_META_RELEASE "FreeBSD_g8a7407012" /* 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 648e4ce0811b..0dfff6b0c883 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-136-g66b81b349" +#define ZFS_META_GITREV "zfs-2.2.99-151-g8a7407012" |