From nobody Sat Jan 11 09:41:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YVYSV3FF7z5jwsT; Sat, 11 Jan 2025 09:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YVYSV2WkNz461s; Sat, 11 Jan 2025 09:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736588490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mT1bWHmqDhCgxRhqjnTkE2G0wmKLXIwB9xs3lAR3qoU=; b=Pv3HhjCeM2Sd6QBH5KE6dULlBanSj3wKL+92nEKNaSSrKoga8Mtl0MdSNvi2ZhDOuTW/iZ VtY4viiTGJZIcL8rZmtV39Rjfmw7JOUg11LUKH216n2fhm31bK6otuTFJKLicXUxO4nYTv gHZztKWXc2pAZ1HR6NZ4vh1DRWUQeJij25bRWP0ncGNK9zU7pU+kCsdyzTcpcr03hZ68Y0 0J3axyncBWnaUT9EJkSc3itqT0p6LI/aLl6aovOGdLvwERiCyJfdXTGlMdJ0oHUiXp1zCq eUouMDDf32s7ukNzziXwZCSZ7yvp2jVmVzPZrXlMH6t0pn9YIiMYoNkodDq/9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736588490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mT1bWHmqDhCgxRhqjnTkE2G0wmKLXIwB9xs3lAR3qoU=; b=QHmFJqDVYkMR57sqTy5rRTemiM7a8GierRi5T24I4vwiACZEgZBW68B2RZeyTRLIMMvtxm mwrEZ2FG+/cwTUb+PwLReV2PUwox3yN6pilgD2UBrJojf3r1dQuc8KO4cuZBjmSqdAPBDN E2Bc8sRoST9UlMR4xPKdD9QMXZUD6slfA8GgdkjZh0skcBN06VOaAJOnRvmdsCKFYZ+XMy av77nGpLdPy6jNPSOtdlihmI2MdlkIco0FZ75Fp1Zd8clgovHD4QCnfBGsk1KXmcuL7bLT 0Qt4emllakIM22YqbxakuA4t6EsDhy06VgMYVmf0FxSThYDfRIIphflVFItr9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736588490; a=rsa-sha256; cv=none; b=gmR2v0i4bd4zzmKpQ9b1AlV86w9tCRsavJeoMF5kctYSdY+rj/Dx0Hen7ACQUweAWH6aHJ 8UKO1p/9mp9SAQoAnMP0Qmg/OY5eLurFAv4RAJWQeh7JhBWamQObn8U/sD7OPiv/aWLuGd PoqP66xwz4TPOneS5rZkWkWMzlXwVvZq5qqY+NU3YpQ2wHGCgncZC2G9Vu6LWfv27A7slT SA1V6PgPfQR81yBfLpzVJFsXQpSfet0fJyAlTSBJ/KViHZJz5b3cKex+Qj7bzWvao3eMUA qTNkP8K8e1qc46zIzjOECqY4VCdOsdIca1ESVR1oxHXNviRGBOYtlXy7ch3chQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YVYSV271pzskD; Sat, 11 Jan 2025 09:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50B9fUOs047516; Sat, 11 Jan 2025 09:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50B9fULI047513; Sat, 11 Jan 2025 09:41:30 GMT (envelope-from git) Date: Sat, 11 Jan 2025 09:41:30 GMT Message-Id: <202501110941.50B9fULI047513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 6bfe9a1393dd - main - zfs: update configs after merging openzfs/zfs@b8e09c700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bfe9a1393ddcc4c41c8bf0ef8a5c4ef43eaebd4 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6bfe9a1393ddcc4c41c8bf0ef8a5c4ef43eaebd4 commit 6bfe9a1393ddcc4c41c8bf0ef8a5c4ef43eaebd4 Author: Martin Matuska AuthorDate: 2025-01-11 09:38:14 +0000 Commit: Martin Matuska CommitDate: 2025-01-11 09:38:14 +0000 zfs: update configs after merging openzfs/zfs@b8e09c700 --- sys/modules/zfs/zfs_config.h | 37 ++++++++++++++++--------------------- sys/modules/zfs/zfs_gitrev.h | 2 +- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index b1f7a1128ca3..3f8def5ce6f8 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -210,7 +210,14 @@ /* Define if revalidate_disk() in block_device_operations */ /* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ -/* check_disk_change() exists */ +/* 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 */ + /* #undef HAVE_CHECK_DISK_CHANGE */ /* copy_splice_read exists */ @@ -394,12 +401,6 @@ /* iops->symlink() takes struct user_namespace* */ /* #undef HAVE_IOPS_SYMLINK_USERNS */ -/* iov_iter_get_pages() is available */ -/* #undef HAVE_IOV_ITER_GET_PAGES */ - -/* iov_iter_get_pages2() is available */ -/* #undef HAVE_IOV_ITER_GET_PAGES2 */ - /* iov_iter_type() is available */ /* #undef HAVE_IOV_ITER_TYPE */ @@ -409,6 +410,9 @@ /* iter_iov() is available */ /* #undef HAVE_ITER_IOV */ +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + /* kernel has kernel_fpu_* functions */ /* #undef HAVE_KERNEL_FPU */ @@ -505,6 +509,9 @@ /* Define if host toolchain supports PCLMULQDQ */ #define HAVE_PCLMULQDQ 1 +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + /* proc_handler ctl_table arg is const */ /* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ @@ -600,9 +607,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the 'strerror_l' function. */ -#define HAVE_STRERROR_L 1 - /* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 @@ -672,21 +676,12 @@ /* fops->dedupe_file_range() is available */ /* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ -/* aops->direct_IO() uses iov_iter without rw */ -/* #undef HAVE_VFS_DIRECT_IO_ITER */ - -/* aops->direct_IO() uses iov_iter with offset */ -/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ - /* filemap_dirty_folio exists */ /* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ /* generic_copy_file_range() is available */ /* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ -/* All required iov_iter interfaces are available */ -/* #undef HAVE_VFS_IOV_ITER */ - /* migrate_folio exists */ /* #undef HAVE_VFS_MIGRATE_FOLIO */ @@ -792,7 +787,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.3.99-114-FreeBSD_ge0039c705" +#define ZFS_META_ALIAS "zfs-2.3.99-157-FreeBSD_gb8e09c700" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -822,7 +817,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "114-FreeBSD_ge0039c705" +#define ZFS_META_RELEASE "157-FreeBSD_gb8e09c700" /* Define the project version. */ #define ZFS_META_VERSION "2.3.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 5466d277b985..7cfe3689e608 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.3.99-114-ge0039c705" +#define ZFS_META_GITREV "zfs-2.3.99-157-gb8e09c700"