diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-11-01 09:12:47 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-11-01 09:13:42 +0000 |
| commit | f8b1db88b827cf24ae14c55a2e762313f0f9911c (patch) | |
| tree | 223057629d5f001ba812822018d3afe8dada8db2 /sys/modules/zfs | |
| parent | 0c5cd045bfb847428a8a5e0e91e6fc3cf27a17c2 (diff) | |
| parent | 41e55b476bcfc90f1ad81c02c5375367fdace9e9 (diff) | |
zfs: merge openzfs/zfs@41e55b476
Notable upstream pull request merges:
#15366 c3773de1 ZIL: Cleanup sync and commit handling
#15409 dbe839a9 zvol: Cleanup set property
#15409 60387fac zvol: Implement zvol threading as a Property
#15409 9ccdb8be zvol: fix delayed update to block device ro entry
#15448 05a7348a RAIDZ: Use cache blocking during parity math
#15452 514d661c Tune zio buffer caches and their alignments
#15456 799e09f7 Unify arc_prune_async() code
#15465 763ca47f Fix block cloning between unencrypted and encrypted
datasets
To make the module version better comparable, the module version number
now includes the commit count since last tag.
Obtained from: OpenZFS
OpenZFS commit: 41e55b476bcfc90f1ad81c02c5375367fdace9e9
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 39caf1355771..5344d981882b 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_g043c6ee3b" +#define ZFS_META_ALIAS "zfs-2.2.99-184-FreeBSD_g41e55b476" /* 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_g043c6ee3b" +#define ZFS_META_RELEASE "184-FreeBSD_g41e55b476" /* 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 b4d500f67a90..9501947797c0 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-174-g043c6ee3b" +#define ZFS_META_GITREV "zfs-2.2.99-184-g41e55b476" |