diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-08-17 19:10:18 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-08-17 19:10:44 +0000 |
| commit | 2faf504d1ab821fe2b9df9d2afb49bb35e1334f4 (patch) | |
| tree | c02e10f9ad7338483c1fe65fe08b017ee5206789 /sys/modules/zfs | |
| parent | a3ddd7c92b9947ac4518fb0b55c2275422d0d627 (diff) | |
| parent | 8ae86e2edc736483c1530fd689525aa2460eaec8 (diff) | |
zfs: merge openzfs/zfs@8ae86e2ed (master) into main
Notable upstream pull request merges:
#12422 Fix/improve dbuf hits accounting
#12406 Increase default volblocksize from 8KB to 16KB
#12398 Remove b_pabd/b_rabd allocation from arc_hdr_alloc()
#12397 Run arc_evict thread at higher priority
#12297 Avoid vq_lock drop in vdev_queue_aggregate()
#12161 Restore FreeBSD sysctl processing for arc.min and arc.max
Obtained from: OpenZFS
OpenZFS commit: 8ae86e2edc736483c1530fd689525aa2460eaec8
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 9542f241179f..75eec9c705a4 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -809,7 +809,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_gf3678d70f" +#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_g8ae86e2ed" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -839,7 +839,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_gf3678d70f" +#define ZFS_META_RELEASE "FreeBSD_g8ae86e2ed" /* Define the project version. */ #define ZFS_META_VERSION "2.1.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index fc9656910a1f..264add9028dd 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -2,4 +2,4 @@ * $FreeBSD$ */ -#define ZFS_META_GITREV "zfs-2.1.99-404-gf3678d70f" +#define ZFS_META_GITREV "zfs-2.1.99-419-g8ae86e2ed" |