diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-12-08 08:32:30 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-12-08 09:13:33 +0000 |
| commit | 3494f7c019fc6558a99f63b7f647373b89bcde92 (patch) | |
| tree | 85afe974106ea6cde253cc046281566a83797549 /sys/modules/zfs | |
| parent | 1f36ca5de596f7c2eb446df5b8e06877901d727a (diff) | |
| parent | 450f2d0b08e73cfb057d0e301a813418b70d64b9 (diff) | |
Notable upstream pull request merges:
#15539 687e4d7f9 Extend import_progress kstat with a notes field
#15544 c7b611926 Allow block cloning across encrypted datasets
#15553 adcea23cb ZIO: Add overflow checks for linear buffers
#15593 5f2700eee zpool: flush output before sleeping
#15609 3e4bef52b Only provide execvpe(3) when needed
#15610 735ba3a7b Use uint64_t instead of u_int64_t
#15612 bcd83ccd2 ZIL: Remove TX_CLONE_RANGE replay for ZVOLs
#15617 55b764e06 ZIL: Do not clone blocks from the future
#15623 727497ccd module/icp/asm-arm/sha2: enable non-SIMD asm kernels
on armv5/6
#15625 9743d0963 BRT: Limit brt_vdev_dump() to only one vdev
#15629 f9765b182 zdb: Dump encrypted write and clone ZIL records
#15634 2aa3a482a ZIL: Remove 128K into 2x68K LWB split optimization
#15639 11656234b FreeBSD: Ensure that zfs_getattr() initializes the
va_rdev field
#15647 4836d293c zfs_refcount_remove: explictly ignore returns
#15649 f0cb6482e setproctitle: fix ununitialised variable
#15650 450f2d0b0 import: ignore return on hostid lookups
Obtained from: OpenZFS
OpenZFS commit: 450f2d0b08e73cfb057d0e301a813418b70d64b9
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 24fb572f00b0..03314cf89e35 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -316,6 +316,9 @@ /* sops->evict_inode() exists */ /* #undef HAVE_EVICT_INODE */ +/* Define to 1 if you have the `execvpe' function. */ +/* #undef HAVE_EXECVPE */ + /* FALLOC_FL_ZERO_RANGE is defined */ /* #undef HAVE_FALLOC_FL_ZERO_RANGE */ @@ -1110,7 +1113,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-239-FreeBSD_ga03ebd9be" +#define ZFS_META_ALIAS "zfs-2.2.99-257-FreeBSD_g450f2d0b0" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1140,7 +1143,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "239-FreeBSD_ga03ebd9be" +#define ZFS_META_RELEASE "257-FreeBSD_g450f2d0b0" /* 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 12c5321568cd..2c3cbd2b99e7 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-239-ga03ebd9be" +#define ZFS_META_GITREV "zfs-2.2.99-257-g450f2d0b0" |