From nobody Tue Mar 29 10:41:08 2022 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 16B021A559A0; Tue, 29 Mar 2022 10:41:09 +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 4KSR1d091tz4SgS; Tue, 29 Mar 2022 10:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648550469; 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=MacY9NGjkeMgq/lynX9cryVZyE7cAMB73M0rbVODRJ0=; b=K44DLXJKC90hEZG8IyVvSvK2SOLsIpy56jZq5pOVi3kaPE34HLDgiUHPRkxSO8YXA7UAS+ 5DHNa/Wt4Kk7rQDMH12Vjr0lzx3gsXboE3lkCa4zMeJ8sFK8+q4Qw+/iCIF73+ak7TyCep K1bjwyiSegQ0+5r0pUQZ8+S6p+zVKGB2JhKI8rUBisoZf032+A1C1I3qG4js94+X181hk0 cEjayfYA1EapZ83DuqOamKBJbPBXtkW5w3d2bbzyQzOVKt8dYXOdYeQ3TgLlnC5bTQ7F8Y DKa+3v56qnVgTNU6Es1SdoVnkFWcG7EALcBDdGmoQXYhoE3NVrKzB3aOPu5wUA== 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 DA68D1CF31; Tue, 29 Mar 2022 10:41:08 +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 22TAf8PR051164; Tue, 29 Mar 2022 10:41:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TAf8BP051163; Tue, 29 Mar 2022 10:41:08 GMT (envelope-from git) Date: Tue, 29 Mar 2022 10:41:08 GMT Message-Id: <202203291041.22TAf8BP051163@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: 8d0b6a7d4969 - main - zfs: update zfs_config.h and zfs_gitrev.h 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 8d0b6a7d49698d69a1efcbc4b495ad0226113d4f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648550469; 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=MacY9NGjkeMgq/lynX9cryVZyE7cAMB73M0rbVODRJ0=; b=o48Xb1JcVI9OnK7TynlmNdPNVn2S+bDv8Sw3jpMtbfIyEnM7Frs1ZLO7epIyA2ouJooizV CYKSeBxMTu2yAn6n35XOTAUWyN/zxWDaL0FKSdokL9hZE+niZbIEHZZSdwzoPBivd+kzE6 PV2FHfBbmZWCE9TOfSyXVRkFYllNgbOw0nL1Nujbj+WP4Ij4+v+en+/A43227bYfEWloEx F/QFk8r1C0VkudBMD6gWB0WiNr73rbcOsuzSTnYCAP78HJ/KoOwchhS4Vky0Xj3sFT82JT kpJNL4GzFkX5+kkgOTxsDx4LVi1BtU3PRR7zdhM/CxkB2T/S2eP65nv4WxQHnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648550469; a=rsa-sha256; cv=none; b=YDsZzEFYhBSClWYuGJNoHhasZQ0NAtUIMDKjStTdQ9giWdqviI0ZRPemQWozGBqfjZqYoj 3UGi4fGq2P+hbZys5GXbDDruBIqmrubLxup5587nM+5FUBXgAJFSEn9atFSFaUP+MaO3ll BKbaAe5vTL4AXx042DHlrV2xCK4lsRLyPHTpgvarnIZTlWLLwlpd3Kb/VSVyi5yN6mMNhJ fu5MfYOinNwmLwIwBS/F68acyWqhFui+zRnTJpK2U8r+KH/PLd6sMBgeoxZOctlYHRev+8 w/tf/r+R8KbIRwopONuGWdBRQprcOBwgnAyaMnZ6yMeiFtnl1vpweGRT5hnDaA== 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=8d0b6a7d49698d69a1efcbc4b495ad0226113d4f commit 8d0b6a7d49698d69a1efcbc4b495ad0226113d4f Author: Martin Matuska AuthorDate: 2022-03-29 10:40:41 +0000 Commit: Martin Matuska CommitDate: 2022-03-29 10:40:41 +0000 zfs: update zfs_config.h and zfs_gitrev.h Update zfs_config.h and zfs_gitrev.h as missed in da5137abd --- sys/modules/zfs/zfs_config.h | 18 +++++++++--------- sys/modules/zfs/zfs_gitrev.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 6b25fe40a614..af37d17dd895 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -94,6 +94,9 @@ /* 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 */ @@ -395,12 +398,6 @@ /* kernel fpu internal */ /* #undef HAVE_KERNEL_FPU_INTERNAL */ -/* 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 */ @@ -784,6 +781,9 @@ /* 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 @@ -875,7 +875,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_ga86e08941" +#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_gbc3f12bfa" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -884,7 +884,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "5.15" +#define ZFS_META_KVER_MAX "5.17" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "3.10" @@ -905,7 +905,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_ga86e08941" +#define ZFS_META_RELEASE "FreeBSD_gbc3f12bfa" /* 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 2c2ea016cdcd..10ffac10cca7 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.1.99-907-ga86e08941" +#define ZFS_META_GITREV "zfs-2.1.99-983-gbc3f12bfa"