diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2025-10-05 06:51:00 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2025-10-05 07:04:02 +0000 |
| commit | 36c970ed985ff3dd5443db4bf2aa58799028512c (patch) | |
| tree | 01baeb54897030d1a8de8c1972e99ccded1ac71e /sys/modules | |
| parent | 0242d4c3aea4b56ba76da440d1948d9e3d19ae87 (diff) | |
| parent | 5605a6d79b3582296208ac391f93a5faf729fa92 (diff) | |
zfs: merge openzfs/zfs@5605a6d79
Notable upstream pull request merges:
#16025 26b0f561b dnode_next_offset: backtrack if lower level does not match
#17758 c722bf881 Add interface to interface spa_get_worst_case_min_alloc()
function
#17765 8d4c3ee9e zvol: Fix blk-mq sync
#17787 8869caae5 zinject: Introduce ready delay fault injection
#17780 b2196fbed Fix 'zpool add' safety check corner cases
#17783 5c38029f4 zdb: add ZFS_KEYFORMAT_RAW support for -K option
#17786 f0a95e897 zpool iostat: refresh pool list every interval
#17807 -multiple zpool iostat: fix regressions in "all pools" mode
after #17786
#17793 -multiple ddt prune: Add SCL_ZIO deadlock workaround
#17799 ac2d8c80b Make mount/share errors non-fatal for zfs create/clone
Obtained from: OpenZFS
OpenZFS commit: 5605a6d79b3582296208ac391f93a5faf729fa92
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 6 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index c595030ed4a0..db1b6f33a8ef 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -843,7 +843,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.99-72-FreeBSD_gb2196fbed" +#define ZFS_META_ALIAS "zfs-2.4.99-95-FreeBSD_g5605a6d79" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -852,7 +852,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "6.16" +#define ZFS_META_KVER_MAX "6.17" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "4.18" @@ -873,7 +873,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "72-FreeBSD_gb2196fbed" +#define ZFS_META_RELEASE "95-FreeBSD_g5605a6d79" /* Define the project version. */ #define ZFS_META_VERSION "2.4.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 9eae1e8573c0..8a1802f5480b 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.99-72-gb2196fbed" +#define ZFS_META_GITREV "zfs-2.4.99-95-g5605a6d79" |