git: ac4c53393668 - stable/15 - zfs: fix mismerge from 2c00a421637

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Martin Matuska <mm_at_FreeBSD.org>
Date: Tue, 25 Aug 2026 09:57:56 UTC
The branch stable/15 has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=ac4c533936682cf8589da226db4d6bc0fb14bd6c

commit ac4c533936682cf8589da226db4d6bc0fb14bd6c
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2026-08-25 09:57:08 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2026-08-25 09:57:08 +0000

    zfs: fix mismerge from 2c00a421637
---
 sys/module/zfs/zfs_config.h  | 946 -------------------------------------------
 sys/module/zfs/zfs_gitrev.h  |   1 -
 sys/modules/zfs/zfs_config.h |  32 +-
 sys/modules/zfs/zfs_gitrev.h |   2 +-
 4 files changed, 26 insertions(+), 955 deletions(-)

diff --git a/sys/module/zfs/zfs_config.h b/sys/module/zfs/zfs_config.h
deleted file mode 100644
index aa562fa08af7..000000000000
--- a/sys/module/zfs/zfs_config.h
+++ /dev/null
@@ -1,946 +0,0 @@
-/*
- */
-
-/* zfs_config.h.  Generated from zfs_config.h.in by configure.  */
-/* zfs_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-/* #undef ENABLE_NLS */
-
-/* __assign_str() has one arg */
-/* #undef HAVE_1ARG_ASSIGN_STR */
-
-/* lookup_bdev() wants 1 arg */
-/* #undef HAVE_1ARG_LOOKUP_BDEV */
-
-/* kernel has access_ok with 'type' parameter */
-/* #undef HAVE_ACCESS_OK_TYPE */
-
-/* add_disk() returns int */
-/* #undef HAVE_ADD_DISK_RET */
-
-/* Define if host toolchain supports AES */
-#define HAVE_AES 1
-
-/* Define if you have [rt] */
-#define HAVE_AIO_H 1
-
-/* Define if your assembler supports .cfi_negate_ra_state. */
-/* #undef HAVE_AS_CFI_PSEUDO_OP */
-
-#ifdef __amd64__
-#ifndef RESCUE
-/* Define if host toolchain supports AVX */
-#define HAVE_AVX 1
-#endif
-
-/* Define if host toolchain supports AVX2 */
-#define HAVE_AVX2 1
-
-/* Define if host toolchain supports AVX512BW */
-#define HAVE_AVX512BW 1
-
-/* Define if host toolchain supports AVX512CD */
-#define HAVE_AVX512CD 1
-
-/* Define if host toolchain supports AVX512DQ */
-#define HAVE_AVX512DQ 1
-
-/* Define if host toolchain supports AVX512ER */
-#define HAVE_AVX512ER 1
-
-/* Define if host toolchain supports AVX512F */
-#define HAVE_AVX512F 1
-
-/* Define if host toolchain supports AVX512IFMA */
-#define HAVE_AVX512IFMA 1
-
-/* Define if host toolchain supports AVX512PF */
-#define HAVE_AVX512PF 1
-
-/* Define if host toolchain supports AVX512VBMI */
-#define HAVE_AVX512VBMI 1
-
-/* Define if host toolchain supports AVX512VL */
-#define HAVE_AVX512VL 1
-#endif
-
-/* backtrace() is available */
-/* #undef HAVE_BACKTRACE */
-
-/* bdevname() is available */
-/* #undef HAVE_BDEVNAME */
-
-/* bdev_check_media_change() exists */
-/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */
-
-/* bdev_file_open_by_path() exists */
-/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */
-
-/* bdev_*_io_acct() available */
-/* #undef HAVE_BDEV_IO_ACCT_63 */
-
-/* bdev_*_io_acct() available */
-/* #undef HAVE_BDEV_IO_ACCT_OLD */
-
-/* bdev_kobj() exists */
-/* #undef HAVE_BDEV_KOBJ */
-
-/* bdev_max_discard_sectors() is available */
-/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */
-
-/* bdev_max_secure_erase_sectors() is available */
-/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */
-
-/* bdev_nr_bytes() is available */
-/* #undef HAVE_BDEV_NR_BYTES */
-
-/* bdev_open_by_path() exists */
-/* #undef HAVE_BDEV_OPEN_BY_PATH */
-
-/* bdev_release() exists */
-/* #undef HAVE_BDEV_RELEASE */
-
-/* block_device_operations->submit_bio() returns void */
-/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */
-
-/* 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 */
-
-/* bio_*_io_acct() available */
-/* #undef HAVE_BIO_IO_ACCT */
-
-/* bio_max_segs() is implemented */
-/* #undef HAVE_BIO_MAX_SEGS */
-
-/* bio_set_dev() GPL-only */
-/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */
-
-/* bio_set_dev() is a macro */
-/* #undef HAVE_BIO_SET_DEV_MACRO */
-
-/* bio_set_op_attrs is available */
-/* #undef HAVE_BIO_SET_OP_ATTRS */
-
-/* blkdev_get_by_path() exists and takes 4 args */
-/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */
-
-/* blkdev_get_by_path() handles ERESTARTSYS */
-/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */
-
-/* __blkdev_issue_discard(flags) is available */
-/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */
-
-/* __blkdev_issue_discard() is available */
-/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */
-
-/* blkdev_issue_discard(flags) is available */
-/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */
-
-/* blkdev_issue_discard() is available */
-/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */
-
-/* blkdev_issue_secure_erase() is available */
-/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */
-
-/* blkdev_put() exists */
-/* #undef HAVE_BLKDEV_PUT */
-
-/* blkdev_put() accepts void* as arg 2 */
-/* #undef HAVE_BLKDEV_PUT_HOLDER */
-
-/* struct queue_limits has a features field */
-/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */
-
-/* blkdev_reread_part() exists */
-/* #undef HAVE_BLKDEV_REREAD_PART */
-
-/* blkg_tryget() is available */
-/* #undef HAVE_BLKG_TRYGET */
-
-/* blkg_tryget() GPL-only */
-/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */
-
-/* blk_alloc_disk() exists */
-/* #undef HAVE_BLK_ALLOC_DISK */
-
-/* blk_alloc_disk() exists and takes 2 args */
-/* #undef HAVE_BLK_ALLOC_DISK_2ARG */
-
-/* blk_alloc_queue() expects request function */
-/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */
-
-/* blk_alloc_queue_rh() expects request function */
-/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */
-
-/* blk_cleanup_disk() exists */
-/* #undef HAVE_BLK_CLEANUP_DISK */
-
-/* blk_mode_t is defined */
-/* #undef HAVE_BLK_MODE_T */
-
-/* block multiqueue hardware context is cached in struct request */
-/* #undef HAVE_BLK_MQ_RQ_HCTX */
-
-/* blk queue backing_dev_info is dynamic */
-/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */
-
-/* blk_queue_discard() is available */
-/* #undef HAVE_BLK_QUEUE_DISCARD */
-
-/* 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 */
-
-/* blk_queue_update_readahead() exists */
-/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */
-
-/* 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 */
-
-/* Define if revalidate_disk() in block_device_operations */
-/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */
-
-/* Define to 1 if you have the Mac OS X function
-   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
-/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
-
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-
-/* check_disk_change() exists */
-/* #undef HAVE_CHECK_DISK_CHANGE */
-
-/* copy_splice_read exists */
-/* #undef HAVE_COPY_SPLICE_READ */
-
-/* cpu_has_feature() is GPL-only */
-/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-/* #undef HAVE_DCGETTEXT */
-
-/* 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 */
-
-/* dequeue_signal() takes 4 arguments */
-/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */
-
-/* lookup_bdev() wants dev_t arg */
-/* #undef HAVE_DEVT_LOOKUP_BDEV */
-
-/* disk_check_media_change() exists */
-/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */
-
-/* disk_*_io_acct() available */
-/* #undef HAVE_DISK_IO_ACCT */
-
-/* disk_update_readahead() exists */
-/* #undef HAVE_DISK_UPDATE_READAHEAD */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* dops->d_revalidate() takes 4 args */
-/* #undef HAVE_D_REVALIDATE_4ARGS */
-
-/* Define if d_set_d_op() is available */
-/* #undef HAVE_D_SET_D_OP */
-
-/* Define to 1 if you have the 'execvpe' function. */
-#define HAVE_EXECVPE 1
-
-/* 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 */
-
-/* flush_dcache_page() is GPL-only */
-/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */
-
-/* use __flush_workqueue() to flush delay workqueue */
-/* #undef HAVE_FLUSH_DELAY_WORKQUEUE_INTERNAL */
-
-/* use system_delay_wq for delay workqueue */
-/* #undef HAVE_FLUSH_DELAY_WORKQUEUE_PERCPU */
-
-/* follow_down() takes a flags parameter */
-/* #undef HAVE_FOLLOW_DOWN_FLAGS */
-
-/* Define if compiler supports -Wformat-overflow */
-/* #undef HAVE_FORMAT_OVERFLOW */
-
-/* fsync_bdev() is declared in include/blkdev.h */
-/* #undef HAVE_FSYNC_BDEV */
-
-/* fs_context exists */
-/* #undef HAVE_FS_CONTEXT */
-
-/* fs_parse() takes fs_parameter_spec directly */
-/* #undef HAVE_FS_PARSE_TAKES_SPEC */
-
-/* yes */
-/* #undef HAVE_GENERIC_FADVISE */
-
-/* generic_fillattr requires struct mnt_idmap* */
-/* #undef HAVE_GENERIC_FILLATTR_IDMAP */
-
-/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */
-/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */
-
-/* generic_fillattr requires struct user_namespace* */
-/* #undef HAVE_GENERIC_FILLATTR_USERNS */
-
-/* generic_*_io_acct() 4 arg available */
-/* #undef HAVE_GENERIC_IO_ACCT_4ARG */
-
-/* GENHD_FL_EXT_DEVT flag is available */
-/* #undef HAVE_GENHD_FL_EXT_DEVT */
-
-/* GENHD_FL_NO_PART flag is available */
-/* #undef HAVE_GENHD_FL_NO_PART */
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-/* #undef HAVE_GETTEXT */
-
-/* Define to 1 if you have the 'gettid' function. */
-/* #undef HAVE_GETTID */
-
-/* iops->get_acl() exists */
-/* #undef HAVE_GET_ACL */
-
-/* iops->get_acl() takes rcu */
-/* #undef HAVE_GET_ACL_RCU */
-
-/* has iops->get_inode_acl() */
-/* #undef HAVE_GET_INODE_ACL */
-
-/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */
-/* #undef HAVE_IATTR_VFSID */
-
-/* Define if you have the iconv() function and it works. */
-#define HAVE_ICONV 1
-
-/* iops->getattr() takes struct mnt_idmap* */
-/* #undef HAVE_IDMAP_IOPS_GETATTR */
-
-/* iops->setattr() takes struct mnt_idmap* */
-/* #undef HAVE_IDMAP_IOPS_SETATTR */
-
-/* id mapping mechanism is mnt_idmap */
-/* #undef HAVE_IDMAP_MNTIDMAP */
-
-/* APIs for idmapped mount are present */
-/* #undef HAVE_IDMAP_MNT_API */
-
-/* mnt_idmap does not have user_namespace */
-/* #undef HAVE_IDMAP_NO_USERNS */
-
-/* id mapping mechanism is user_namespace */
-/* #undef HAVE_IDMAP_USERNS */
-
-/* Define if compiler supports -Wimplicit-fallthrough */
-/* #undef HAVE_IMPLICIT_FALLTHROUGH */
-
-/* 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 */
-
-/* inode_get_ctime() exists in linux/fs.h */
-/* #undef HAVE_INODE_GET_CTIME */
-
-/* inode_get_mtime() exists in linux/fs.h */
-/* #undef HAVE_INODE_GET_MTIME */
-
-/* inode_owner_or_capable() exists */
-/* #undef HAVE_INODE_OWNER_OR_CAPABLE */
-
-/* inode_owner_or_capable() takes mnt_idmap */
-/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */
-
-/* inode_owner_or_capable() takes user_ns */
-/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */
-
-/* inode_set_atime_to_ts() exists in linux/fs.h */
-/* #undef HAVE_INODE_SET_ATIME_TO_TS */
-
-/* inode_set_ctime_to_ts() exists in linux/fs.h */
-/* #undef HAVE_INODE_SET_CTIME_TO_TS */
-
-/* inode_set_mtime_to_ts() exists in linux/fs.h */
-/* #undef HAVE_INODE_SET_MTIME_TO_TS */
-
-/* inode_state_read_once() exists */
-/* #undef HAVE_INODE_STATE_READ_ONCE */
-
-/* timestamp_truncate() exists */
-/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* iops->create() takes struct mnt_idmap* */
-/* #undef HAVE_IOPS_CREATE_IDMAP */
-
-/* iops->create() takes struct user_namespace* */
-/* #undef HAVE_IOPS_CREATE_USERNS */
-
-/* iops->mkdir() returns struct dentry* */
-/* #undef HAVE_IOPS_MKDIR_DENTRY */
-
-/* iops->mkdir() takes struct mnt_idmap* */
-/* #undef HAVE_IOPS_MKDIR_IDMAP */
-
-/* iops->mkdir() takes struct user_namespace* */
-/* #undef HAVE_IOPS_MKDIR_USERNS */
-
-/* iops->mknod() takes struct mnt_idmap* */
-/* #undef HAVE_IOPS_MKNOD_IDMAP */
-
-/* iops->mknod() takes struct user_namespace* */
-/* #undef HAVE_IOPS_MKNOD_USERNS */
-
-/* iops->permission() takes struct mnt_idmap* */
-/* #undef HAVE_IOPS_PERMISSION_IDMAP */
-
-/* iops->permission() takes struct user_namespace* */
-/* #undef HAVE_IOPS_PERMISSION_USERNS */
-
-/* iops->rename() takes struct mnt_idmap* */
-/* #undef HAVE_IOPS_RENAME_IDMAP */
-
-/* iops->rename() takes struct user_namespace* */
-/* #undef HAVE_IOPS_RENAME_USERNS */
-
-/* iops->symlink() takes struct mnt_idmap* */
-/* #undef HAVE_IOPS_SYMLINK_IDMAP */
-
-/* iops->symlink() takes struct user_namespace* */
-/* #undef HAVE_IOPS_SYMLINK_USERNS */
-
-/* iov_iter_get_pages2() is available */
-/* #undef HAVE_IOV_ITER_GET_PAGES2 */
-
-/* iov_iter_type() is available */
-/* #undef HAVE_IOV_ITER_TYPE */
-
-/* Define to 1 if you have the 'issetugid' function. */
-#define HAVE_ISSETUGID 1
-
-/* iter_iov() is available */
-/* #undef HAVE_ITER_IOV */
-
-/* iter_is_ubuf() is available */
-/* #undef HAVE_ITER_IS_UBUF */
-
-/* kasan_enabled() is GPL-only */
-/* #undef HAVE_KASAN_ENABLED_GPL_ONLY */
-
-/* kernel has kernel_fpu_* functions */
-/* #undef HAVE_KERNEL_FPU */
-
-/* kernel has asm/fpu/api.h */
-/* #undef HAVE_KERNEL_FPU_API_HEADER */
-
-/* kernel fpu internal */
-/* #undef HAVE_KERNEL_FPU_INTERNAL */
-
-/* kernel has asm/fpu/internal.h */
-/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */
-
-/* Define if compiler supports -Winfinite-recursion */
-/* #undef HAVE_KERNEL_INFINITE_RECURSION */
-
-/* kernel defines intptr_t */
-/* #undef HAVE_KERNEL_INTPTR_T */
-
-/* kernel has kernel_neon_* functions */
-/* #undef HAVE_KERNEL_NEON */
-
-/* kernel does stack verification */
-/* #undef HAVE_KERNEL_OBJTOOL */
-
-/* kernel has linux/objtool.h */
-/* #undef HAVE_KERNEL_OBJTOOL_HEADER */
-
-/* strlcpy() exists */
-/* #undef HAVE_KERNEL_STRLCPY */
-
-/* kernel has kmap_local_page */
-/* #undef HAVE_KMAP_LOCAL_PAGE */
-
-/* Define if you have [aio] */
-/* #undef HAVE_LIBAIO */
-
-/* Define if you have [blkid] */
-/* #undef HAVE_LIBBLKID */
-
-/* Define if you have [crypto] */
-#define HAVE_LIBCRYPTO 1
-
-/* Define if you have [tirpc] */
-/* #undef HAVE_LIBTIRPC */
-
-/* Define if you have [udev] */
-/* #undef HAVE_LIBUDEV */
-
-/* Define if you have [unwind] */
-/* #undef HAVE_LIBUNWIND */
-
-/* libunwind has unw_get_elf_filename */
-/* #undef HAVE_LIBUNWIND_ELF */
-
-/* Define if you have [uuid] */
-/* #undef HAVE_LIBUUID */
-
-/* building against unsupported kernel version */
-/* #undef HAVE_LINUX_EXPERIMENTAL */
-
-/* makedev() is declared in sys/mkdev.h */
-/* #undef HAVE_MAKEDEV_IN_MKDEV */
-
-/* makedev() is declared in sys/sysmacros.h */
-/* #undef HAVE_MAKEDEV_IN_SYSMACROS */
-
-/* Noting that make_request_fn() returns blk_qc_t */
-/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */
-
-/* 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 */
-
-/* page_mapping() is available */
-/* #undef HAVE_MM_PAGE_MAPPING */
-
-/* page_size() is available */
-/* #undef HAVE_MM_PAGE_SIZE */
-
-/* mount_setattr() and struct mount_attr are available */
-/* #undef HAVE_MOUNT_SETATTR */
-
-/* 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 */
-
-/* readahead_page() exists */
-/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */
-
-/* part_to_dev() exists */
-/* #undef HAVE_PART_TO_DEV */
-
-/* iops->getattr() takes a path */
-/* #undef HAVE_PATH_IOPS_GETATTR */
-
-/* Define if host toolchain supports PCLMULQDQ */
-#define HAVE_PCLMULQDQ 1
-
-/* 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 */
-
-/* proc_ops structure exists */
-/* #undef HAVE_PROC_OPS_STRUCT */
-
-/* If available, contains the Python version number currently in use. */
-/* #undef HAVE_PYTHON */
-
-/* qat is enabled and existed */
-/* #undef HAVE_QAT */
-
-/* struct reclaim_state has reclaimed */
-/* #undef HAVE_RECLAIM_STATE_RECLAIMED */
-
-/* register_shrinker is vararg */
-/* #undef HAVE_REGISTER_SHRINKER_VARARG */
-
-/* register_sysctl_sz exists */
-/* #undef HAVE_REGISTER_SYSCTL_SZ */
-
-/* register_sysctl_table exists */
-/* #undef HAVE_REGISTER_SYSCTL_TABLE */
-
-/* revalidate_disk() is available */
-/* #undef HAVE_REVALIDATE_DISK */
-
-/* revalidate_disk_size() is available */
-/* #undef HAVE_REVALIDATE_DISK_SIZE */
-
-/* Define to 1 if you have the <security/pam_modules.h> header file. */
-#define HAVE_SECURITY_PAM_MODULES_H 1
-
-/* setattr_prepare() accepts mnt_idmap */
-/* #undef HAVE_SETATTR_PREPARE_IDMAP */
-
-/* setattr_prepare() is available, doesn't accept user_namespace */
-/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */
-
-/* setattr_prepare() accepts user_namespace */
-/* #undef HAVE_SETATTR_PREPARE_USERNS */
-
-/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */
-/* #undef HAVE_SET_ACL_IDMAP_DENTRY */
-
-/* iops->set_acl() takes 4 args */
-/* #undef HAVE_SET_ACL_USERNS */
-
-/* iops->set_acl() takes 4 args, arg2 is struct dentry * */
-/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */
-
-/* Define if set_default_d_op() is available */
-/* #undef HAVE_SET_DEFAULT_D_OP */
-
-/* shrinker_register exists */
-/* #undef HAVE_SHRINKER_REGISTER */
-
-/* kernel_siginfo_t exists */
-/* #undef HAVE_SIGINFO */
-
-/* sops->free_inode() exists */
-/* #undef HAVE_SOPS_FREE_INODE */
-
-#if defined(__amd64__) || defined(__i386__)
-/* Define if host toolchain supports SSE */
-#define HAVE_SSE 1
-
-/* Define if host toolchain supports SSE2 */
-#define HAVE_SSE2 1
-
-/* Define if host toolchain supports SSE3 */
-#define HAVE_SSE3 1
-
-/* Define if host toolchain supports SSE4.1 */
-#define HAVE_SSE4_1 1
-
-/* Define if host toolchain supports SSE4.2 */
-#define HAVE_SSE4_2 1
-
-/* Define if host toolchain supports SSSE3 */
-#define HAVE_SSSE3 1
-#endif
-
-/* STACK_FRAME_NON_STANDARD is defined */
-/* #undef HAVE_STACK_FRAME_NON_STANDARD */
-
-/* STACK_FRAME_NON_STANDARD asm macro is defined */
-/* #undef HAVE_STACK_FRAME_NON_STANDARD_ASM */
-
-/* standalone <linux/stdarg.h> exists */
-/* #undef HAVE_STANDALONE_LINUX_STDARG */
-
-/* statx() is available */
-/* #undef HAVE_STATX */
-
-/* STATX_MNT_ID is available */
-/* #undef HAVE_STATX_MNT_ID */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the 'strlcat' function. */
-#define HAVE_STRLCAT 1
-
-/* Define to 1 if you have the 'strlcpy' function. */
-#define HAVE_STRLCPY 1
-
-/* submit_bio is member of struct block_device_operations */
-/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */
-
-/* have super_block s_shrink */
-/* #undef HAVE_SUPER_BLOCK_S_SHRINK */
-
-/* have super_block s_shrink pointer */
-/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */
-
-/* have super_block s_wb_err */
-/* #undef HAVE_SUPER_BLOCK_S_WB_ERR */
-
-/* sync_blockdev() is declared in include/blkdev.h */
-/* #undef HAVE_SYNC_BLOCKDEV */
-
-/* struct kobj_type has default_groups */
-/* #undef HAVE_SYSFS_DEFAULT_GROUPS */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* timer_delete_sync is available */
-/* #undef HAVE_TIMER_DELETE_SYNC */
-
-/* i_op->tmpfile() uses old dentry signature */
-/* #undef HAVE_TMPFILE_DENTRY */
-
-/* i_op->tmpfile() has mnt_idmap */
-/* #undef HAVE_TMPFILE_IDMAP */
-
-/* i_op->tmpfile() has userns */
-/* #undef HAVE_TMPFILE_USERNS */
-
-/* totalhigh_pages() exists */
-/* #undef HAVE_TOTALHIGH_PAGES */
-
-/* kernel has totalram_pages() */
-/* #undef HAVE_TOTALRAM_PAGES_FUNC */
-
-/* Define to 1 if you have the 'udev_device_get_is_initialized' function. */
-/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */
-
-/* kernel has __kernel_fpu_* functions */
-/* #undef HAVE_UNDERSCORE_KERNEL_FPU */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* iops->getattr() takes struct user_namespace* */
-/* #undef HAVE_USERNS_IOPS_GETATTR */
-
-/* iops->setattr() takes struct user_namespace* */
-/* #undef HAVE_USERNS_IOPS_SETATTR */
-
-#ifdef __amd64__
-/* Define if host toolchain supports VAES */
-#define HAVE_VAES 1
-#endif
-
-/* fops->clone_file_range() is available */
-/* #undef HAVE_VFS_CLONE_FILE_RANGE */
-
-/* fops->dedupe_file_range() is available */
-/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */
-
-/* filemap_dirty_folio exists */
-/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */
-
-/* generic_copy_file_range() is available */
-/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */
-
-/* migratepage exists */
-/* #undef HAVE_VFS_MIGRATEPAGE */
-
-/* migrate_folio exists */
-/* #undef HAVE_VFS_MIGRATE_FOLIO */
-
-/* vfs_parse_fs_string() takes 3 args */
-/* #undef HAVE_VFS_PARSE_FS_STRING_3ARGS */
-
-/* vfs_path_lookup() is exported */
-/* #undef HAVE_VFS_PATH_LOOKUP_EXPORTED */
-
-/* address_space_operations->readpages exists */
-/* #undef HAVE_VFS_READPAGES */
-
-/* read_folio exists */
-/* #undef HAVE_VFS_READ_FOLIO */
-
-/* fops->remap_file_range() is available */
-/* #undef HAVE_VFS_REMAP_FILE_RANGE */
-
-/* __set_page_dirty_nobuffers exists */
-/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */
-
-/* splice_copy_file_range() is available */
-/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */
-
-/* address_space_operations->writepage exists */
-/* #undef HAVE_VFS_WRITEPAGE */
-
-/* __vmalloc page flags exists */
-/* #undef HAVE_VMALLOC_PAGE_KERNEL */
-
-#ifdef __amd64__
-/* Define if host toolchain supports VPCLMULQDQ */
-#define HAVE_VPCLMULQDQ 1
-#endif
-
-/* 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 */
-
-/* xattr_handler->set() wants both dentry and inode */
-/* #undef HAVE_XATTR_SET_DENTRY_INODE */
-
-/* xattr_handler->set() takes mnt_idmap */
-/* #undef HAVE_XATTR_SET_IDMAP */
-
-/* xattr_handler->set() takes user_namespace */
-/* #undef HAVE_XATTR_SET_USERNS */
-
-/* Define if host toolchain supports XSAVE */
-#define HAVE_XSAVE 1
-
-/* Define if host toolchain supports XSAVEOPT */
-#define HAVE_XSAVEOPT 1
-
-/* 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
-
-/* libunwind is llvm libunwind */
-/* #undef IS_LIBUNWIND_LLVM */
-
-/* kernel exports FPU functions */
-/* #undef KERNEL_EXPORTS_X86_FPU */
-
-/* TBD: fetch(3) support */
-#if 0
-/* whether the chosen libfetch is to be loaded at run-time */
-#define LIBFETCH_DYNAMIC 1
-
-/* libfetch is fetch(3) */
-#define LIBFETCH_IS_FETCH 1
-
-/* libfetch is libcurl */
-#define LIBFETCH_IS_LIBCURL 0
-
-/* soname of chosen libfetch */
-#define LIBFETCH_SONAME "libfetch.so.6"
-#endif
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* make_request_fn() return type */
-/* #undef MAKE_REQUEST_FN_RET */
-
-/* using complete_and_exit() instead */
-/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */
-
-/* Defined for legacy compatibility. */
-#define SPL_META_ALIAS ZFS_META_ALIAS
-
-/* Defined for legacy compatibility. */
-#define SPL_META_RELEASE ZFS_META_RELEASE
-
-/* Defined for legacy compatibility. */
-#define SPL_META_VERSION ZFS_META_VERSION
-
-/* pde_data() is PDE_DATA() */
-/* #undef SPL_PDE_DATA */
-
-/* Define to 1 if all of the C89 standard headers exist (not just the ones
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
-#define SYSTEM_FREEBSD 1
-
-/* True if ZFS is to be compiled for a Linux system */
-/* #undef SYSTEM_LINUX */
-
-/* Version number of package */
-/* #undef ZFS_DEBUG */
-
-/* /dev/zfs minor */
-/* #undef ZFS_DEVICE_MINOR */
-
-/* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.4.4-1-FreeBSD_g71a9f9578"
-
-/* Define the project author. */
-#define ZFS_META_AUTHOR "OpenZFS"
-
-/* Define the project release date. */
-/* #undef ZFS_META_DATA */
-
-/* Define the maximum compatible kernel version. */
-#define ZFS_META_KVER_MAX "7.2"
-
-/* Define the minimum compatible kernel version. */
-#define ZFS_META_KVER_MIN "4.18"
-
-/* Define the project license. */
-#define ZFS_META_LICENSE "CDDL"
-
-/* Define the libtool library 'age' version information. */
-/* #undef ZFS_META_LT_AGE */
-
-/* Define the libtool library 'current' version information. */
-/* #undef ZFS_META_LT_CURRENT */
-
-/* Define the libtool library 'revision' version information. */
-/* #undef ZFS_META_LT_REVISION */
-
-/* Define the project name. */
-#define ZFS_META_NAME "zfs"
-
-/* Define the project release. */
-#define ZFS_META_RELEASE "1-FreeBSD_g71a9f9578"
-
-/* Define the project version. */
-#define ZFS_META_VERSION "2.4.4"
-
-/* count is located in percpu_ref.data */
-/* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */
diff --git a/sys/module/zfs/zfs_gitrev.h b/sys/module/zfs/zfs_gitrev.h
deleted file mode 100644
index 3fe7b414db24..000000000000
--- a/sys/module/zfs/zfs_gitrev.h
+++ /dev/null
@@ -1 +0,0 @@
-#define	ZFS_META_GITREV "zfs-2.4.4-0-g71a9f9578"
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index 63d2093e83d3..aa562fa08af7 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -289,6 +289,15 @@
 /* flush_dcache_page() is GPL-only */
 /* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */
 
+/* use __flush_workqueue() to flush delay workqueue */
+/* #undef HAVE_FLUSH_DELAY_WORKQUEUE_INTERNAL */
*** 90 LINES SKIPPED ***