diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-06-20 13:16:16 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-06-20 13:16:16 +0000 |
| commit | d4b4969967504aa53e67d431e6458ff9a4d10293 (patch) | |
| tree | cc9aba9b4bfb1d0204637852a1bbc97ff92217f9 /sys/modules | |
| parent | 09274116f4d90f5c25cfad3bd7d13b48b2d494da (diff) | |
| parent | 3de7aeb68ac1cc1fedd99506671d9028ad1a3c20 (diff) | |
| download | src-d4b4969967504aa53e67d431e6458ff9a4d10293.tar.gz src-d4b4969967504aa53e67d431e6458ff9a4d10293.zip | |
zfs: merge openzfs/zfs@3de7aeb68 (zfs-2.1-release) into stable/13
Notable upstream pull request merges:
#12054 Avoid deadlock when removing L2ARC devices under I/O
#12221 vdev_draid_min_asize() ignores reserved space
Obtained from: OpenZFS
OpenZFS commit: 3de7aeb68ac1cc1fedd99506671d9028ad1a3c20
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index aaf35705dbc0..344196bbede9 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -734,7 +734,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.1.0-FreeBSD_gc3b60eded" +#define ZFS_META_ALIAS "zfs-2.1.0-FreeBSD_g3de7aeb68" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -764,7 +764,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_gc3b60eded" +#define ZFS_META_RELEASE "FreeBSD_g3de7aeb68" /* Define the project version. */ #define ZFS_META_VERSION "2.1.0" |