diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-08-10 09:15:30 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-08-10 09:43:43 +0000 |
| commit | ce4dcb97ca433b2a2f03fbae957dae0ff16f6f51 (patch) | |
| tree | d839178ddbd33504db2c2a3b106c3c6af71fb1c7 /sys/modules/zfs/zfs_config.h | |
| parent | 54a543d5ea3a58aee2f001498376127efea24bd2 (diff) | |
| parent | 9c56b8ec7855119c8948c551ee28086a11465a56 (diff) | |
| download | src-ce4dcb97ca433b2a2f03fbae957dae0ff16f6f51.tar.gz src-ce4dcb97ca433b2a2f03fbae957dae0ff16f6f51.zip | |
zfs: merge openzfs/zfs@9c56b8ec7
Notable upstream pull request merges:
#15817 5536c0dee Sync AUX label during pool import
#15889 c7ada64bb ddt: dedup table quota enforcement
#15890 62e7d3c89 ddt: add support for prefetching tables into the ARC
#15894 e26b3771e spa_preferred_class: pass the entire zio
#15894 d54d0fff3 dnode: allow storage class to be overridden by object type
#16197 55427add3 Several improvements to ARC shrinking
#16217 -multiple JSON output for various zfs and zpool subcommands
#16248 24e6585e7 libzfs.h: Set ZFS_MAXPROPLEN and ZPOOL_MAXPROPLEN
to ZAP_MAXVALUELEN
#16264 9dfc5c4a0 Fix long_free_dirty accounting for small files
#16268 ed0db1cc8 Make txg_wait_synced conditional in zfsvfs_teardown,
for FreeBSD
#16288 d60debbf5 Fix sa_add_projid to lookup and update SA_ZPL_DXATTR
#16308 ec580bc52 zfs: add bounds checking to zil_parse
#16310 c21dc56ea Fix zdb_dump_block for little endian
#16315 7ddc1f737 zil: add stats for commit failure/fallback
#16326 b0bf14cdb abd: lift ABD zero scan from zio_compress_data()
to abd_cmp_zero()
#16337 c8184d714 Block cloning conditionally destroy ARC buffer
#16338 dbe07928b Add support for multiple lines to the sharenfs property
for FreeBSD
#16374 1a3e32e6a Cleanup DB_DNODE() macros usage
#16374 ed87d456e Skip dnode handles use when not needed
#16346 fb6d8cf22 Add some missing vdev properties
#16364 670147be5 zvol: ensure device minors are properly cleaned up
#16382 dea8fabf7 FreeBSD: Fix RLIMIT_FSIZE handling for block cloning
#16387 aef452f10 Improve zfs_blkptr_verify()
#16395 cbcb52243 Fix the names of some FreeBSD sysctls in
include/tunables.cfg
#16401 5b9f3b766 Soften pruning threshold on not evictable metadata
#16404 cdd53fea1 FreeBSD: Add missing memory reclamation accounting
#16404 1fdcb653b Once more refactor arc_summary output
#16419 1f5bf91a8 Fix memory corruption during parallel zpool import
with -o cachefile
#16426 cf6e8b218 zstream: remove duplicate highbit64 definition
Obtained from: OpenZFS
OpenZFS commit: 9c56b8ec7855119c8948c551ee28086a11465a56
Diffstat (limited to 'sys/modules/zfs/zfs_config.h')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 920bb59e2fc9..631c83fe8bab 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1200,7 +1200,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-559-FreeBSD_g1147a2797" +#define ZFS_META_ALIAS "zfs-2.2.99-623-FreeBSD_g9c56b8ec7" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1230,7 +1230,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "559-FreeBSD_g1147a2797" +#define ZFS_META_RELEASE "623-FreeBSD_g9c56b8ec7" /* Define the project version. */ #define ZFS_META_VERSION "2.2.99" |