4 files changed, 26 insertions, 10 deletions

diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile
index af0cace6c5a9..334c1765a606 100644
--- a/sys/modules/dtrace/fasttrap/Makefile
+++ b/sys/modules/dtrace/fasttrap/Makefile
@@ -17,7 +17,7 @@ CFLAGS+=	-I${SYSDIR}/cddl/contrib/opensolaris/uts/powerpc
 .PATH:		${SYSDIR}/cddl/contrib/opensolaris/uts/powerpc/dtrace
 .endif
 
-.PATH:		${SYSDIR}/contrib/openzfs/module/unicode
+.PATH:		${SYSDIR}/contrib/openzfs/module/zfs
 SRCS+=		u8_textprep.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index fed29336e5de..5bb057ee95a2 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -205,9 +205,6 @@ SRCS+=	abd_os.c \
 	zio_crypt.c \
 	zvol_os.c
 
-#unicode
-SRCS+=	u8_textprep.c
-
 #zcommon
 SRCS+=	zfeature_common.c \
 	zfs_comutil.c \
@@ -297,6 +294,7 @@ SRCS+=	abd.c \
 	space_map.c \
 	space_reftree.c \
 	txg.c \
+	u8_textprep.c \
 	uberblock.c \
 	unique.c \
 	vdev.c \
@@ -369,7 +367,6 @@ SRCS+=	zfs_zstd.c \
 	huf_compress.c \
 	huf_decompress.c \
 	pool.c \
-	xxhash.c \
 	zstd_common.c \
 	zstd_compress.c \
 	zstd_compress_literals.c \
@@ -382,7 +379,8 @@ SRCS+=	zfs_zstd.c \
 	zstd_fast.c \
 	zstd_lazy.c \
 	zstd_ldm.c \
-	zstd_opt.c
+	zstd_opt.c \
+	zstd_preSplit.c
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index 41d529acf50e..8b5e3ffc4573 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -195,6 +195,9 @@
 /* backing_dev_info is available through queue gendisk */
 /* #undef HAVE_BLK_QUEUE_DISK_BDI */
 
+/* blk_queue_rot() is available */
+/* #undef HAVE_BLK_QUEUE_ROT */
+
 /* blk_queue_secure_erase() is available */
 /* #undef HAVE_BLK_QUEUE_SECURE_ERASE */
 
@@ -271,6 +274,9 @@
 /* fault_in_iov_iter_readable() is available */
 /* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */
 
+/* linux/filelock.h exists */
+/* #undef HAVE_FILELOCK_HEADER */
+
 /* file->f_version exists */
 /* #undef HAVE_FILE_F_VERSION */
 
@@ -283,6 +289,9 @@
 /* fsync_bdev() is declared in include/blkdev.h */
 /* #undef HAVE_FSYNC_BDEV */
 
+/* fs_context exists */
+/* #undef HAVE_FS_CONTEXT */
+
 /* yes */
 /* #undef HAVE_GENERIC_FADVISE */
 
@@ -508,6 +517,9 @@
 /* Define to 1 if you have the 'mlockall' function. */
 #define HAVE_MLOCKALL 1
 
+/* 'flags' in 'struct page' is a struct */
+/* #undef HAVE_MM_PAGE_FLAGS_STRUCT */
+
 /* PG_error flag is available */
 /* #undef HAVE_MM_PAGE_FLAG_ERROR */
 
@@ -541,6 +553,9 @@
 /* pin_user_pages_unlocked() is available */
 /* #undef HAVE_PIN_USER_PAGES_UNLOCKED */
 
+/* posix_acl_to_xattr() allocates its result */
+/* #undef HAVE_POSIX_ACL_TO_XATTR_ALLOC */
+
 /* proc_handler ctl_table arg is const */
 /* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */
 
@@ -598,6 +613,9 @@
 /* Define if set_default_d_op() is available */
 /* #undef HAVE_SET_DEFAULT_D_OP */
 
+/* Define if host toolchain supports SHA512 */
+#define HAVE_SHA512EXT 1
+
 /* shrinker_register exists */
 /* #undef HAVE_SHRINKER_REGISTER */
 
@@ -862,7 +880,7 @@
 /* #undef ZFS_DEVICE_MINOR */
 
 /* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.4.99-292-FreeBSD_g962e68865"
+#define ZFS_META_ALIAS "zfs-2.4.99-402-FreeBSD_gf8e5af53e"
 
 /* Define the project author. */
 #define ZFS_META_AUTHOR "OpenZFS"
@@ -871,7 +889,7 @@
 /* #undef ZFS_META_DATA */
 
 /* Define the maximum compatible kernel version. */
-#define ZFS_META_KVER_MAX "6.18"
+#define ZFS_META_KVER_MAX "6.19"
 
 /* Define the minimum compatible kernel version. */
 #define ZFS_META_KVER_MIN "4.18"
@@ -892,7 +910,7 @@
 #define ZFS_META_NAME "zfs"
 
 /* Define the project release. */
-#define ZFS_META_RELEASE "292-FreeBSD_g962e68865"
+#define ZFS_META_RELEASE "402-FreeBSD_gf8e5af53e"
 
 /* Define the project version. */
 #define ZFS_META_VERSION "2.4.99"
diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h
index 4f16a8d1c917..5868c6ed60e2 100644
--- a/sys/modules/zfs/zfs_gitrev.h
+++ b/sys/modules/zfs/zfs_gitrev.h
@@ -1 +1 @@
-#define	ZFS_META_GITREV "zfs-2.4.99-292-g962e68865"
+#define	ZFS_META_GITREV "zfs-2.4.99-402-gf8e5af53e-dirty"