From nobody Fri Mar 11 06:47:03 2022 X-Original-To: dev-commits-src-all@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 DF7AD1A0BB6A; Fri, 11 Mar 2022 06:47:03 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KFGgq4B4gz3h41; Fri, 11 Mar 2022 06:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646981223; 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=Ms9jsMtSg0Ki0lhFItSi3lTwy+GMpKYLhRUt6mUpVnc=; b=d/D+YkQ0k08NAqLBy66Lyn5Jgi8EISpNtDXYOQlkSHO29UXG76jG134BzVJxgZLzVsJXJ/ V8uNYFx3svFLJDBByCWtuCq/KDo2zAaNk8J5n2s4DyEIm6mKmTWVehdcfc6LMFk0qh9DF7 wiAx/r6T9qfziFU/VMu0uu5+TSGcc+QPXQtrs4jzx7pCW3He6CL+sDPii4OQT8Ads4s6Wh e1JIuOxPAtzNCYmLas4IU8/SQf606fgeMLzFvwcljGkq7ReySamAU7/cJbaBzmWNw4biV5 +OAjGfmztot+97YYeTfg0zjkeDwPioOpc052jZnqw5WQvZVxM/YNWbn7tyeHfg== 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 7013014859; Fri, 11 Mar 2022 06:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22B6l3Ju090919; Fri, 11 Mar 2022 06:47:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22B6l3pA090918; Fri, 11 Mar 2022 06:47:03 GMT (envelope-from git) Date: Fri, 11 Mar 2022 06:47:03 GMT Message-Id: <202203110647.22B6l3pA090918@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: f03aca96b841 - main - zfs: update zfs_config.h and zfs_gitrev.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f03aca96b841033ced66956e3a6a104ede83f35d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646981223; 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=Ms9jsMtSg0Ki0lhFItSi3lTwy+GMpKYLhRUt6mUpVnc=; b=vPt+39uFEl7ekRImVcoWPokGCVb81Dt+PTN+awoytbENYq0d2WnLv9Z4v17Pb7Tc+ZHcaE vd6QwWnyzK3mruFkeebjTz05t+of7oSqkhp54xrNWvM4DdbchCZFm5+mxeNWWCJrQyp1Fa 8sBqU8Bm6LF1Fh+XeNgeaDhnnoLNr1L0Vh/cVONs0v25t/56+KhJazLGzi1sXzsEycNBCg fEh+IfL/BjL8pE02b5e8tKZ3VTgqJxDDdFK/cs+weMBc8yLHfzKwZD68CgGuHTpZUkDicC Ur7SJKD+LE7HkcX1BWWqmcOofDrCbHRtzWT18QguXSBPuAVO2rS0INIW2rxgkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646981223; a=rsa-sha256; cv=none; b=IXLyqO2e70jlGEFa5EudKn04woR7uqLsFHs1Jyv/ANzyFKLZ8UoNaSo/tSOrx8idqqSPNt QRK6Z5LYO4TT9F6Zgaq5aF10ALreMsMvlcRvVLCzLhqENZXdHtwxwzYVsJXN5gbx3Xuug3 b1c8p+WSUip8kiqffLeyoUtuNhZRztOdo2kazOFhQCQ3IGZ95mc8ICAiYM0JSXtBrOa1oB v6c+pt5KjGUv5DNa+axEQJh5Cujfai9PF/JAmOvzqSA3vR+S9Tb1Pw0GpcIECUtBl6izI0 I469cV3oJkAbZvaWptx2V1aHOGKCUkBihFpXU31bTDtlroOyo7U+WS5FcbbS4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f03aca96b841033ced66956e3a6a104ede83f35d commit f03aca96b841033ced66956e3a6a104ede83f35d Author: Martin Matuska AuthorDate: 2022-03-11 06:45:48 +0000 Commit: Martin Matuska CommitDate: 2022-03-11 06:45:48 +0000 zfs: update zfs_config.h and zfs_gitrev.h Update zfs_config.h and zfs_gitrev.h as missed in c03c5b1c8 --- sys/modules/zfs/zfs_config.h | 34 ++++++++++++++++++++++++++++++++-- sys/modules/zfs/zfs_gitrev.h | 6 +----- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index fe01c65dfc19..6b25fe40a614 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -42,6 +42,9 @@ /* posix_acl has refcount_t */ /* #undef HAVE_ACL_REFCOUNT */ +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + /* Define if host toolchain supports AES */ #define HAVE_AES 1 @@ -215,6 +218,9 @@ /* DECLARE_EVENT_CLASS() is available */ /* #undef HAVE_DECLARE_EVENT_CLASS */ +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + /* lookup_bdev() wants dev_t arg */ /* #undef HAVE_DEVT_LOOKUP_BDEV */ @@ -245,6 +251,12 @@ /* sops->evict_inode() exists */ /* #undef HAVE_EVICT_INODE */ +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + /* fops->aio_fsync() exists */ /* #undef HAVE_FILE_AIO_FSYNC */ @@ -386,6 +398,9 @@ /* kernel has asm/fpu/xcr.h */ /* #undef HAVE_KERNEL_FPU_XCR_HEADER */ +/* kernel fpu and XSAVE internal */ +/* #undef HAVE_KERNEL_FPU_XSAVE_INTERNAL */ + /* uncached_acl_sentinel() exists */ /* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ @@ -760,6 +775,15 @@ /* 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 + /* Define if you have [z] */ #define HAVE_ZLIB 1 @@ -796,6 +820,9 @@ /* struct shrink_control has nid */ /* #undef SHRINK_CONTROL_HAS_NID */ +/* using complete_and_exit() instead */ +/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */ + /* Defined for legacy compatibility. */ #define SPL_META_ALIAS ZFS_META_ALIAS @@ -805,6 +832,9 @@ /* Defined for legacy compatibility. */ #define SPL_META_VERSION ZFS_META_VERSION +/* pde_data() is PDE_DATA() */ +/* #undef SPL_PDE_DATA */ + /* True if ZFS is to be compiled for a FreeBSD system */ #define SYSTEM_FREEBSD 1 @@ -845,7 +875,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_g17b2ae0b2" +#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_ga86e08941" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -875,7 +905,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g17b2ae0b2" +#define ZFS_META_RELEASE "FreeBSD_ga86e08941" /* Define the project version. */ #define ZFS_META_VERSION "2.1.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index f052d4047999..2c2ea016cdcd 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1,5 +1 @@ -/* - * $FreeBSD$ - */ - -#define ZFS_META_GITREV "zfs-2.1.99-694-g17b2ae0b2" +#define ZFS_META_GITREV "zfs-2.1.99-907-ga86e08941"