diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-10-04 12:02:37 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-10-04 12:08:42 +0000 |
| commit | f7f4bd06a8d4e5d1e92d0d2905a68a2a03ed9c0c (patch) | |
| tree | 986c7135832a9f7d718a3bb97e839fcd49a5418e /sys/modules/zfs | |
| parent | f06c928544747326c04f84c582bcd5fda0d7bb91 (diff) | |
| parent | f795e90a11c683d64bacc260fb7feab705b220b1 (diff) | |
zfs: merge openzfs/zfs@f795e90a1
Notable upstream pull request merges:
#15322 4e16964e1 Add '-u' - nomount flag for zfs set
#15331 fe4d055b3 Report ashift of L2ARC devices in zdb
#15333 249d759ca Fix invalid pointer access in trace_dbuf.h
#15339 f795e90a1 Add BTI landing pads to the AArch64 SHA2 assembly
Obtained from: OpenZFS
OpenZFS commit: f795e90a11c683d64bacc260fb7feab705b220b1
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 b77a32e4754c..b355e0cd6d0f 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_ge13538856" +#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_gf795e90a1" /* 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_ge13538856" +#define ZFS_META_RELEASE "FreeBSD_gf795e90a1" /* 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 d3c3225a609c..07340bf8aab7 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-118-ge13538856" +#define ZFS_META_GITREV "zfs-2.2.99-125-gf795e90a1" |