8 files changed, 29 insertions, 4 deletions
diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile
index b28df768c3d5..becf42a6a79a 100644
--- a/sys/modules/ath10k/Makefile
+++ b/sys/modules/ath10k/Makefile
@@ -1,3 +1,5 @@
+.include <kmod.opts.mk>
+
 DEVATH10KDIR=	${SRCTOP}/sys/contrib/dev/athk/ath10k
 
 .PATH: ${DEVATH10KDIR}
diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile
index a2f0064c2ae9..eaf196af5b55 100644
--- a/sys/modules/ath11k/Makefile
+++ b/sys/modules/ath11k/Makefile
@@ -1,3 +1,5 @@
+.include <kmod.opts.mk>
+
 DEVATH11KDIR=	${SRCTOP}/sys/contrib/dev/athk/ath11k
 
 .PATH: ${DEVATH11KDIR}
diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile
index ecca0bc3b409..071bb88a8b37 100644
--- a/sys/modules/ath12k/Makefile
+++ b/sys/modules/ath12k/Makefile
@@ -1,3 +1,5 @@
+.include <kmod.opts.mk>
+
 DEVATH12KDIR=	${SRCTOP}/sys/contrib/dev/athk/ath12k
 
 .PATH: ${DEVATH12KDIR}
diff --git a/sys/modules/bnxt/bnxt_en/Makefile b/sys/modules/bnxt/bnxt_en/Makefile
index 12c23898c106..dc9b30b7f2af 100644
--- a/sys/modules/bnxt/bnxt_en/Makefile
+++ b/sys/modules/bnxt/bnxt_en/Makefile
@@ -9,6 +9,7 @@ SRCS	+= bnxt_sysctl.c
 SRCS	+= bnxt_mgmt.c
 SRCS	+= bnxt_dcb.c bnxt_dcb.h
 SRCS	+= bnxt_auxbus_compat.c bnxt_auxbus_compat.h
+SRCS	+= bnxt_sriov.c bnxt_sriov.h
 SRCS	+= bnxt_ulp.c bnxt_ulp.h
 SRCS	+= ${LINUXKPI_GENSRCS}
 
diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile
index 6561327abfca..ff4536694dfc 100644
--- a/sys/modules/i2c/Makefile
+++ b/sys/modules/i2c/Makefile
@@ -28,6 +28,7 @@ SUBDIR = \
 
 .if !empty(OPT_FDT)
 SUBDIR += hym8563 \
+	  rs5c372a \
 	  rv3032 \
 	  rx8803 \
 	  tca64xx \
diff --git a/sys/modules/i2c/rs5c372a/Makefile b/sys/modules/i2c/rs5c372a/Makefile
new file mode 100644
index 000000000000..3bd387115a8a
--- /dev/null
+++ b/sys/modules/i2c/rs5c372a/Makefile
@@ -0,0 +1,14 @@
+.PATH:	${SRCTOP}/sys/dev/iicbus/rtc/
+KMOD	= rs5c372a
+SRCS	= rs5c372a.c
+
+# Generated files...
+SRCS+=	\
+	bus_if.h \
+	clock_if.h \
+	device_if.h \
+	iicbus_if.h \
+	opt_platform.h \
+	ofw_bus_if.h \
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index 1cf55ead9587..b4e4c1e4d29b 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -204,6 +204,9 @@
 /* DECLARE_EVENT_CLASS() is available */
 /* #undef HAVE_DECLARE_EVENT_CLASS */
 
+/* dentry aliases are in d_u member */
+/* #undef HAVE_DENTRY_D_U_ALIASES */
+
 /* 3-arg dequeue_signal() takes a type argument */
 /* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */
 
@@ -911,7 +914,7 @@
 /* #undef ZFS_DEVICE_MINOR */
 
 /* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.4.99-522-FreeBSD_g1644e2ffd"
+#define ZFS_META_ALIAS "zfs-2.4.99-566-FreeBSD_ga12c6ed62"
 
 /* Define the project author. */
 #define ZFS_META_AUTHOR "OpenZFS"
@@ -920,7 +923,7 @@
 /* #undef ZFS_META_DATA */
 
 /* Define the maximum compatible kernel version. */
-#define ZFS_META_KVER_MAX "6.19"
+#define ZFS_META_KVER_MAX "7.0"
 
 /* Define the minimum compatible kernel version. */
 #define ZFS_META_KVER_MIN "4.18"
@@ -941,7 +944,7 @@
 #define ZFS_META_NAME "zfs"
 
 /* Define the project release. */
-#define ZFS_META_RELEASE "522-FreeBSD_g1644e2ffd"
+#define ZFS_META_RELEASE "566-FreeBSD_ga12c6ed62"
 
 /* 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 9c5cec1628b7..113c3d7a5bbb 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-522-g1644e2ffd"
+#define	ZFS_META_GITREV "zfs-2.4.99-566-ga12c6ed62-dirty"