diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-11-29 22:07:33 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-11-29 22:08:25 +0000 |
| commit | 525fe93dc7487a1e63a90f6a2b956abc601963c1 (patch) | |
| tree | 80cd74fa461c69c5de3cd100e07439c0918ad6a0 /sys/modules/zfs | |
| parent | b70e57be2cfe83ec9f410e2f317ea38aaac61a98 (diff) | |
| parent | a03ebd9beec6243682557fa692c12b1061fc58bd (diff) | |
zfs: merge openzfs/zfs@a03ebd9be
Notable upstream pull request merges:
#15517 2a27fd411 ZIL: Assert record sizes in different places
#15557 b94ce4e17 module/icp/asm-arm/sha2: fix compiling on armv5/6
#15557 4340f69be module/icp/asm-arm/sha2: auto detect __ARM_ARCH
#15603 a03ebd9be ZIL: Call brt_pending_add() replaying TX_CLONE_RANGE
#15606 1c38cdfe9 zdb: fix printf() length for uint64_t devid
Obtained from: OpenZFS
OpenZFS commit: a03ebd9beec6243682557fa692c12b1061fc58bd
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 aab672a77324..24fb572f00b0 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1110,7 +1110,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-231-FreeBSD_g688514e47" +#define ZFS_META_ALIAS "zfs-2.2.99-239-FreeBSD_ga03ebd9be" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1140,7 +1140,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "231-FreeBSD_g688514e47" +#define ZFS_META_RELEASE "239-FreeBSD_ga03ebd9be" /* 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 3dc0d7e7eaa5..12c5321568cd 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-231-g688514e47" +#define ZFS_META_GITREV "zfs-2.2.99-239-ga03ebd9be" |