diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-12-15 13:17:23 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-12-15 13:18:07 +0000 |
| commit | 5fb307d29b364982acbde82cbf77db3cae486f8c (patch) | |
| tree | c88ea4fda58b14ab37ae6140ccb7135bf152ac55 /sys/modules/zfs | |
| parent | c2e340452c147b551180f2a1600ae76491342b0e (diff) | |
| parent | 86e115e21e5bdeee73c88c5a1a73a29d9637380a (diff) | |
zfs: merge openzfs/zfs@86e115e21
Notable upstream pull request merges:
#15643 a9b937e06 For db_marker inherit the db pointer for AVL comparision
#15644 e53e60c0b DMU: Fix lock leak on dbuf_hold() error
#15653 86063d903 dbuf: Handle arcbuf assignment after block cloning
#15656 86e115e21 dbuf: Set dr_data when unoverriding after clone
Obtained from: OpenZFS
OpenZFS commit: 86e115e21e5bdeee73c88c5a1a73a29d9637380a
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 03314cf89e35..b6e93c8eadf7 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1113,7 +1113,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-257-FreeBSD_g450f2d0b0" +#define ZFS_META_ALIAS "zfs-2.2.99-268-FreeBSD_g86e115e21" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1143,7 +1143,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "257-FreeBSD_g450f2d0b0" +#define ZFS_META_RELEASE "268-FreeBSD_g86e115e21" /* 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 2c3cbd2b99e7..f87735ca2dfe 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-257-g450f2d0b0" +#define ZFS_META_GITREV "zfs-2.2.99-268-g86e115e21" |