diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-09-02 10:32:48 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-09-02 10:33:26 +0000 |
| commit | 2ad756a6bbb30fc98ee9000fba5bceec916a6c70 (patch) | |
| tree | e9b4d857d72cf082b29cb918ae8de328e0c69324 /sys/modules/zfs | |
| parent | f4296cfb409a48de00bfa60e76f686c2b031876f (diff) | |
| parent | 95f71c019d7c3e3b728a9b05e2117ce6b09f1b87 (diff) | |
zfs: merge openzfs/zfs@95f71c019
Notable upstream pull request merges:
#15018 Increase limit of redaction list by using spill block
#15161 Make zoned/jailed zfsprops(7) make more sense
#15216 Relax error reporting in zpool import and zpool split
#15218 Selectable block allocators
#15227 ZIL: Tune some assertions
#15228 ZIL: Revert zl_lock scope reduction
#15233 ZIL: Change ZIOs issue order
Obtained from: OpenZFS
OpenZFS commit: 95f71c019d7c3e3b728a9b05e2117ce6b09f1b87
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 08092e5e169c..49b699b24018 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1095,7 +1095,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g804414aad" +#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g95f71c019" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1125,7 +1125,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g804414aad" +#define ZFS_META_RELEASE "FreeBSD_g95f71c019" /* 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 00a5acf6e4e4..f477478a7f7d 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-68-g804414aad" +#define ZFS_META_GITREV "zfs-2.2.99-81-g95f71c019" |