diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-11-08 08:16:01 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-11-08 08:17:55 +0000 |
| commit | 14c2e0a0c57e48a41433fdca668fac8882fb04df (patch) | |
| tree | 4ee3a4f7a498b69ab7e2eaf6402b273e6b3f2036 /sys/modules/zfs | |
| parent | f25b0d6dd75d41cbb27d1cc40bb53185672281e0 (diff) | |
| parent | 9198de8f1079a8bbb837de3e3f8e236777b1375d (diff) | |
zfs: merge openzfs/zfs@9198de8f1
Notable upstream pull request merges:
#15197 3bd4df384 Improve ZFS objset sync parallelism
#15455 020f6fd09 FreeBSD: Implement taskq_init_ent()
#15476 3d86999c7 sa_lookup() ignores buffer size
#15478 2a154b848 Fix accounting error for pending sync IO ops in
zpool iostat
#15484 dc45a00ea Add kern.features.zfs
#15486 e36ff84c3 Update the kstat dataset_name when renaming a zvol
#15491 f4cd1bac7 Make abd_raidz_gen_iterate() pass an initialized
pointer to the callback
#15495 58398cbd0 FreeBSD: Optimize large kstat outputs
Obtained from: OpenZFS
OpenZFS commit: 9198de8f1079a8bbb837de3e3f8e236777b1375d
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 5344d981882b..dd1a926d286c 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-184-FreeBSD_g41e55b476" +#define ZFS_META_ALIAS "zfs-2.2.99-197-FreeBSD_g9198de8f1" /* 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 "184-FreeBSD_g41e55b476" +#define ZFS_META_RELEASE "197-FreeBSD_g9198de8f1" /* 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 9501947797c0..86525c162b79 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-184-g41e55b476" +#define ZFS_META_GITREV "zfs-2.2.99-197-g9198de8f1" |