7 files changed, 20 insertions, 21 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index cde4c1c0e9ac..2aded5d568cb 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -135,7 +135,6 @@ SUBDIR=	\
 	gpio \
 	${_gve} \
 	hid \
-	hifn \
 	${_hpt27xx} \
 	${_hptiop} \
 	${_hptmv} \
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index 4ff023e6bca5..a645c1673167 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -1,7 +1,6 @@
 .PATH:  ${SRCTOP}/sys/netpfil/ipfw
 KMOD=   dummynet
-SRCS=   ip_dummynet.c
-SRCS+= ip_dn_glue.c ip_dn_io.c
+SRCS=   ip_dummynet.c ip_dn_io.c
 SRCS+= dn_aqm_codel.c dn_aqm_pie.c
 SRCS+= dn_heap.c dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c 
 SRCS+= dn_sched_prio.c dn_sched_fq_codel.c dn_sched_fq_pie.c
diff --git a/sys/modules/hifn/Makefile b/sys/modules/hifn/Makefile
deleted file mode 100644
index a425cc39768a..000000000000
--- a/sys/modules/hifn/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PATH:	${SRCTOP}/sys/dev/hifn
-KMOD	= hifn
-SRCS	= hifn7751.c opt_hifn.h
-SRCS   += device_if.h bus_if.h pci_if.h
-SRCS   += opt_bus.h cryptodev_if.h
-
-.if !defined(KERNBUILDDIR)
-opt_hifn.h:
-	echo "#define HIFN_DEBUG 1" > ${.TARGET}
-.endif
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile
index c796fb0701c5..5ef13757e621 100644
--- a/sys/modules/smbfs/Makefile
+++ b/sys/modules/smbfs/Makefile
@@ -1,6 +1,6 @@
-.PATH:	${SRCTOP}/sys/crypto/des \
+.PATH:	${SRCTOP}/sys/crypto \
+	${SRCTOP}/sys/crypto/des \
 	${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \
-	${SRCTOP}/sys/kern \
 	${SRCTOP}/sys/libkern \
 	${SRCTOP}/sys/netsmb \
 	${SRCTOP}/sys/fs/smbfs
diff --git a/sys/modules/thunderbolt/Makefile b/sys/modules/thunderbolt/Makefile
index 3b279f4352d4..ba7c7cab6e6b 100644
--- a/sys/modules/thunderbolt/Makefile
+++ b/sys/modules/thunderbolt/Makefile
@@ -5,7 +5,7 @@ SRCS=	nhi_pci.c nhi.c tb_pcib.c tb_acpi_pcib.c tb_debug.c nhi_wmi.c
 SRCS+=	router.c hcm.c tb_dev.c
 SRCS+=	opt_thunderbolt.h
 SRCS+=	device_if.h bus_if.h pci_if.h pcib_if.h tb_if.c tb_if.h
-SRCS+=	opt_acpi.h opt_acpi_wmi.h acpi_if.h acpi_wmi_if.h
+SRCS+=	opt_acpi.h acpi_if.h acpi_wmi_if.h
 
 opt_thunderbolt.h:
 	echo "#define THUNDERBOLT_DEBUG 1" > ${.TARGET}
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index 3a17ed289235..39b9229653af 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -204,6 +204,10 @@
 /* BLK_STS_RESV_CONFLICT is defined */
 /* #undef HAVE_BLK_STS_RESV_CONFLICT */
 
+/* Define if getgeo() in block_device_operations takes struct gendisk * as its
+   first arg */
+/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */
+
 /* Define if release() in block_device_operations takes 1 arg */
 /* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */
 
@@ -339,6 +343,9 @@
 /* Define if compiler supports -Winfinite-recursion */
 /* #undef HAVE_INFINITE_RECURSION */
 
+/* inode_generic_drop() exists */
+/* #undef HAVE_INODE_GENERIC_DROP */
+
 /* inode_get_atime() exists in linux/fs.h */
 /* #undef HAVE_INODE_GET_ATIME */
 
@@ -510,6 +517,9 @@
 /* Define if host toolchain supports MOVBE */
 #define HAVE_MOVBE 1
 
+/* Define if ns_type is accessible through ns_common */
+/* #undef HAVE_NS_COMMON_TYPE */
+
 /* folio_wait_bit() exists */
 /* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */
 
@@ -759,6 +769,9 @@
 /* int (*writepage_t)() takes struct folio* */
 /* #undef HAVE_WRITEPAGE_T_FOLIO */
 
+/* write_cache_pages() is available */
+/* #undef HAVE_WRITE_CACHE_PAGES */
+
 /* xattr_handler->get() wants dentry and inode and flags */
 /* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */
 
@@ -843,7 +856,7 @@
 /* #undef ZFS_DEVICE_MINOR */
 
 /* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.4.99-113-FreeBSD_g6ae99d269"
+#define ZFS_META_ALIAS "zfs-2.4.99-129-FreeBSD_g0455150f1"
 
 /* Define the project author. */
 #define ZFS_META_AUTHOR "OpenZFS"
@@ -873,7 +886,7 @@
 #define ZFS_META_NAME "zfs"
 
 /* Define the project release. */
-#define ZFS_META_RELEASE "113-FreeBSD_g6ae99d269"
+#define ZFS_META_RELEASE "129-FreeBSD_g0455150f1"
 
 /* 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 6f568754f61d..87d2071cb0d2 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-113-g6ae99d269"
+#define	ZFS_META_GITREV "zfs-2.4.99-129-g0455150f1"