diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-12-07 13:04:59 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-12-07 13:55:14 +0000 |
| commit | 17aab35a77a1b1bf02fc85bb8ffadccb0ca5006d (patch) | |
| tree | 4ce60446e48e128052732b8d0ad5a0977bbdde6b /sys/modules/zfs | |
| parent | 977679d651de56720892868ec429b90e90e2ee20 (diff) | |
| parent | e0039c70573e455f4745a83b7d5a6a5f6f2e58a8 (diff) | |
zfs: merge openzfs/zfs@e0039c705
Notable upstream pull request merges:
#16215 44446dccd During pool export flush the ARC asynchronously
#16301 4b4e346b9 Add ability to scrub from last scrubbed txg
#16755 0ffa6f346 zdb: show dedup table and log attributes
#16801 1cd2419ec Fix race in libzfs_run_process_impl
#16814 a01504b35 Improve speculative prefetcher for block cloning
#16819 a44eaf169 Optimize RAIDZ expansion
#16825 e8b333e4d Fix false assertion in dmu_tx_dirty_buf() on cloning
#16829 6e3c109bc Fix regression in dmu_buf_will_fill()
#16832 2507db612 zdb_il: use flex array member to access ZIL records
#16834 0e020bf3e FreeBSD: Remove an incorrect assertion in zfs_getpages()
#16836 c33a55b0c Allow dsl_deadlist_open() return errors
Obtained from: OpenZFS
OpenZFS commit: e0039c70573e455f4745a83b7d5a6a5f6f2e58a8
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 1959b7cab014..b1f7a1128ca3 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -792,7 +792,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.3.99-92-FreeBSD_gd0a91b9f8" +#define ZFS_META_ALIAS "zfs-2.3.99-114-FreeBSD_ge0039c705" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -822,7 +822,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "92-FreeBSD_gd0a91b9f8" +#define ZFS_META_RELEASE "114-FreeBSD_ge0039c705" /* Define the project version. */ #define ZFS_META_VERSION "2.3.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index a2122a773a82..5466d277b985 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.3.99-92-gd0a91b9f8" +#define ZFS_META_GITREV "zfs-2.3.99-114-ge0039c705" |