diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-03-14 01:23:51 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-04-04 13:18:45 +0000 |
| commit | cf2a72643460a2bb50fcdf78fb8721a692315793 (patch) | |
| tree | efa442c1e0902d1e9b49d7e8503d5feb675bfedf /sys/modules | |
| parent | 1260724822b5830411cbf56d48e997be1628e53b (diff) | |
| download | src-cf2a72643460a2bb50fcdf78fb8721a692315793.tar.gz src-cf2a72643460a2bb50fcdf78fb8721a692315793.zip | |
zfs: merge OpenZFS master-9305ff2ed
Notable upstream pull request merges:
#11153 Scalable teardown lock for FreeBSD
#11651 Don't bomb out when using keylocation=file://
#11667 zvol: call zil_replaying() during replay
#11683 abd_get_offset_struct() may allocate new abd
#11693 Intentionally allow ZFS_READONLY in zfs_write
#11716 zpool import cachefile improvements
#11720 FreeBSD: Clean up zfsdev_close to match Linux
#11730 FreeBSD: bring back possibility to rewind the
checkpoint from bootloader
Obtained from: OpenZFS
(cherry picked from commit 9db44a8e5da9bf1ce6dd1c0f1468ddafed6d6c91)
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 ae5316a46f10..f5a7ab069879 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.0.0-FreeBSD_gbedbc13da" +#define ZFS_META_ALIAS "zfs-2.0.0-FreeBSD_g9305ff2ed" /* 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_gbedbc13da" +#define ZFS_META_RELEASE "FreeBSD_g9305ff2ed" /* Define the project version. */ #define ZFS_META_VERSION "2.0.0" |