diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-02-15 09:21:13 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-02-15 09:22:15 +0000 |
| commit | e2257b3168fc1697518265527e5d817eca6c43b8 (patch) | |
| tree | 2cb028ed04bdb43ecf67f4068b37d7dbf075e7d0 /sys/modules/zfs | |
| parent | 3733d82c4deb49035a39e18744085d1e3e9b8dc5 (diff) | |
| parent | e0bd8118d04b55b7adf3d9ba256ad4bb53e66512 (diff) | |
zfs: merge openzfs/zfs@e0bd8118d
Notable upstream pull request merges:
#15469 cbe882298 Add slow disk diagnosis to ZED
#15857 d0d273320 Update zfs-snapshot.8
#15864 a5a725440 zfs list: add '-t fs' and '-t vol' options
#15874 6cc93ccde BRT: Fix slop space calculation with block cloning
#15882 a0635ae73 zdb: Fix false leak report for BRT objects
Obtained from: OpenZFS
OpenZFS commit: e0bd8118d04b55b7adf3d9ba256ad4bb53e66512
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 7 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index f452cffa20c8..5a3e421ab67e 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -162,6 +162,9 @@ /* blkdev_issue_discard() is available */ /* #undef HAVE_BLKDEV_ISSUE_DISCARD */ +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC */ + /* blkdev_issue_secure_erase() is available */ /* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ @@ -1152,7 +1155,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-338-FreeBSD_g229b9f4ed" +#define ZFS_META_ALIAS "zfs-2.2.99-345-FreeBSD_ge0bd8118d" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1182,7 +1185,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "338-FreeBSD_g229b9f4ed" +#define ZFS_META_RELEASE "345-FreeBSD_ge0bd8118d" /* 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 04ced657e728..9370fe080d71 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-338-g229b9f4ed" +#define ZFS_META_GITREV "zfs-2.2.99-345-ge0bd8118d" |