git: 8d0b6a7d4969 - main - zfs: update zfs_config.h and zfs_gitrev.h
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Mar 2022 10:41:08 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=8d0b6a7d49698d69a1efcbc4b495ad0226113d4f
commit 8d0b6a7d49698d69a1efcbc4b495ad0226113d4f
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2022-03-29 10:40:41 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2022-03-29 10:40:41 +0000
zfs: update zfs_config.h and zfs_gitrev.h
Update zfs_config.h and zfs_gitrev.h as missed in da5137abd
---
sys/modules/zfs/zfs_config.h | 18 +++++++++---------
sys/modules/zfs/zfs_gitrev.h | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index 6b25fe40a614..af37d17dd895 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -94,6 +94,9 @@
/* bdev_whole() is available */
/* #undef HAVE_BDEV_WHOLE */
+/* bio_alloc() takes 4 arguments */
+/* #undef HAVE_BIO_ALLOC_4ARG */
+
/* bio->bi_bdev->bd_disk exists */
/* #undef HAVE_BIO_BDEV_DISK */
@@ -395,12 +398,6 @@
/* kernel fpu internal */
/* #undef HAVE_KERNEL_FPU_INTERNAL */
-/* kernel has asm/fpu/xcr.h */
-/* #undef HAVE_KERNEL_FPU_XCR_HEADER */
-
-/* kernel fpu and XSAVE internal */
-/* #undef HAVE_KERNEL_FPU_XSAVE_INTERNAL */
-
/* uncached_acl_sentinel() exists */
/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */
@@ -784,6 +781,9 @@
/* Define if host toolchain supports XSAVES */
#define HAVE_XSAVES 1
+/* ZERO_PAGE() is GPL-only */
+/* #undef HAVE_ZERO_PAGE_GPL_ONLY */
+
/* Define if you have [z] */
#define HAVE_ZLIB 1
@@ -875,7 +875,7 @@
/* #undef ZFS_IS_GPL_COMPATIBLE */
/* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_ga86e08941"
+#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_gbc3f12bfa"
/* Define the project author. */
#define ZFS_META_AUTHOR "OpenZFS"
@@ -884,7 +884,7 @@
/* #undef ZFS_META_DATA */
/* Define the maximum compatible kernel version. */
-#define ZFS_META_KVER_MAX "5.15"
+#define ZFS_META_KVER_MAX "5.17"
/* Define the minimum compatible kernel version. */
#define ZFS_META_KVER_MIN "3.10"
@@ -905,7 +905,7 @@
#define ZFS_META_NAME "zfs"
/* Define the project release. */
-#define ZFS_META_RELEASE "FreeBSD_ga86e08941"
+#define ZFS_META_RELEASE "FreeBSD_gbc3f12bfa"
/* 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 2c2ea016cdcd..10ffac10cca7 100644
--- a/sys/modules/zfs/zfs_gitrev.h
+++ b/sys/modules/zfs/zfs_gitrev.h
@@ -1 +1 @@
-#define ZFS_META_GITREV "zfs-2.1.99-907-ga86e08941"
+#define ZFS_META_GITREV "zfs-2.1.99-983-gbc3f12bfa"