diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-10-30 20:28:03 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-10-30 20:42:11 +0000 |
| commit | 6c1e79df8c651b31ca4f656336e6c5ac29a66482 (patch) | |
| tree | 751fa1ffefeabc6e248d538b8883cff639b40285 /sys/modules/zfs | |
| parent | 87c5032353106764f324e82541662f448e68f38a (diff) | |
| parent | 043c6ee3b6bfb55f8d36e1f048ff13128c279fb8 (diff) | |
zfs: merge openzfs/zfs@043c6ee3b
Notable upstream pull request merges:
#15360 97a0b5be Add mutex_enter_interruptible() for interruptible sleeping
IOCTLs
#15381 252f46be ZIL: Detect single-threaded workloads
#15398 3afdc97d ZIO: Remove READY pipeline stage from root ZIOs
#15428 e007908a ABD: Be more assertive in iterators
#15436 07345ac2 Add prefetch property
#15438 e9725abd Revert "Do not persist user/group/project quota zap objects
when unneeded"
#15451 043c6ee3 Read prefetched buffers from L2ARC
Obtained from: OpenZFS
OpenZFS commit: 043c6ee3b6bfb55f8d36e1f048ff13128c279fb8
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 e91cf5f22368..39caf1355771 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-FreeBSD_g797f55ef1" +#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g043c6ee3b" /* 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 "FreeBSD_g797f55ef1" +#define ZFS_META_RELEASE "FreeBSD_g043c6ee3b" /* 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 e88a5e8dbb37..b4d500f67a90 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-162-g797f55ef1" +#define ZFS_META_GITREV "zfs-2.2.99-174-g043c6ee3b" |