diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-11-21 00:39:04 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-11-21 00:46:00 +0000 |
| commit | a2b560cc69eb254c92caf2027a69cadf9865d273 (patch) | |
| tree | 7077756a0da0726954010b59ade86d432ddaed6f /sys/modules/zfs | |
| parent | bbde5c0725a5b34c456b3818cc69d17f22cef9f8 (diff) | |
| parent | a94860a6dee1c07bb96ee36dafcba40b804560cc (diff) | |
zfs: merge openzfs/zfs@a94860a6d
Notable upstream pull request merges:
#15511 92dc4ad83 Consider `dnode_t` allocations in dbuf cache size accounting
#15514 22c8c33a5 Use abd_zero_off() where applicable
#15515 5a3bffab1 ZIO: Optimize zio_flush()
#15527 cd67bc0ae freebsd: remove __FBSDID macro use
Obtained from: OpenZFS
OpenZFS commit: a94860a6dee1c07bb96ee36dafcba40b804560cc
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 3fb946f3de98..bcd23c9ea276 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-211-FreeBSD_g03e9caaec" +#define ZFS_META_ALIAS "zfs-2.2.99-217-FreeBSD_ga94860a6d" /* 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 "211-FreeBSD_g03e9caaec" +#define ZFS_META_RELEASE "217-FreeBSD_ga94860a6d" /* 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 5924053674c3..a68f618a16b9 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-211-g03e9caaec" +#define ZFS_META_GITREV "zfs-2.2.99-217-ga94860a6d" |