From nobody Thu Sep 21 11:13:00 2023 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 4Rrt6j1Sd4z4tykH; Thu, 21 Sep 2023 11:13:01 +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 4Rrt6j0yy7z3D4t; Thu, 21 Sep 2023 11:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695294781; 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=xfGfYMnn/3eILhbIIFgzNu64AfYAKdG1YoJNmBZIzbc=; b=MM61QrDWs2DPK4ErIT1WUltDCFKumaYcCSOrZoJQmk7ueuxDy7Pi16s2NQYg4aCy8UYEuq n9LJvd2wv+1FZ+SVhxdo7m9wRFzAmjjdchYIoRv6iHWx/mlFP8VJslJYSK377WljpRrc13 OdvFID3FTEtn0mxglYzXMDBUTxUbdjN0w4szm2uVHWPxPUqjL7UQxePYovPNJq+SxigeZf 0M3W+gGNHAjDoJ9ysvcY/DncdZDRtsNNFtDMkG/TP4qTi+pfCIUmCIUiXnTZfcksvbQHuW z8cok91RcPHhp6CkbAJ5zqril33blF7z517IA/mahkXe3DITLQOayMSydj0Wtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695294781; a=rsa-sha256; cv=none; b=TTwgBEXksBQvNoyPgAHdCe8nZ1XvZoomPItR85CMCa8r77YTWbTdtS/SERSDlIWtPq7DgL VVfKAZeysa5/sg+pMrozlelwg54YfjN+0FM8qoNhz31+oqvOWiiB0VG3nRJQsboP0AhDFa xIratCISN85JA0HgSGogCOkYftkIQyFSh6gDIG2OQpl/u58MXMVaomA4jPVfnB/s13/S/s N6dxXwCYckcbZARc9rCQ4WIxn718HD14DYfOzK4oC34bA7z0ALdc89RVk3gWKCp+JDhpEF HIaurd58s7Ud6PeC4dIm/PgycEScP/0KU+1Saki267eIfnYIwo2XtCLY47r9iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695294781; 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=xfGfYMnn/3eILhbIIFgzNu64AfYAKdG1YoJNmBZIzbc=; b=PxyqcU7th5g4xKTha0In5KZrCAGaQWhCIeYAlVQhzRGSDVFxlL0JSS04hpC0xNxDuy9xyl Nfv6ES3ku3nsRb4QCgTQf1Gx6ocW1zvwsmYZZyyTQEgAL2jBqdubMPCney2OpTQSiPlDMQ WGxo4W3PCZ35XEJWmzSVX3j1rtFz+p461sQ+tmcAp30THRlX4BEeBNpnRJbj8A7M4YZ36T 5ZN7qVIKCIpXiCgKk/kv/ArOBeYPFBEDX6R+lGMZrQXRX5RlsUtt8xzSOXheim3jXjJ+cx 4FcHZXvtel1XslUrr/J5kooVfke7Q1JWXiqKnwxtV/ohAnJfARecdU9vbWjBhQ== 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 4Rrt6j01SbzcRQ; Thu, 21 Sep 2023 11:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LBD0aE074672; Thu, 21 Sep 2023 11:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LBD0Le074669; Thu, 21 Sep 2023 11:13:00 GMT (envelope-from git) Date: Thu, 21 Sep 2023 11:13:00 GMT Message-Id: <202309211113.38LBD0Le074669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 646c82e08a43 - stable/14 - zfs: update zfs_config.h and zfs_gitrev.h (missed in 35e5fd1b2) 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 646c82e08a433b61b97073051fd558e42c64603c Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=646c82e08a433b61b97073051fd558e42c64603c commit 646c82e08a433b61b97073051fd558e42c64603c Author: Martin Matuska AuthorDate: 2023-09-21 11:10:13 +0000 Commit: Martin Matuska CommitDate: 2023-09-21 11:12:46 +0000 zfs: update zfs_config.h and zfs_gitrev.h (missed in 35e5fd1b2) --- sys/modules/zfs/zfs_config.h | 27 ++++++++++++++++++++++++--- sys/modules/zfs/zfs_gitrev.h | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 122a7a3f032e..f5d0a4d6d7d1 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -147,6 +147,9 @@ /* 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 */ @@ -156,6 +159,9 @@ /* blkdev_issue_secure_erase() is available */ /* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + /* blkdev_reread_part() exists */ /* #undef HAVE_BLKDEV_REREAD_PART */ @@ -177,6 +183,9 @@ /* blk_cleanup_disk() exists */ /* #undef HAVE_BLK_CLEANUP_DISK */ +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + /* block multiqueue is available */ /* #undef HAVE_BLK_MQ */ @@ -216,6 +225,9 @@ /* BLK_STS_RESV_CONFLICT is defined */ /* #undef HAVE_BLK_STS_RESV_CONFLICT */ +/* 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 */ @@ -243,6 +255,9 @@ /* copy_from_iter() is available */ /* #undef HAVE_COPY_FROM_ITER */ +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + /* copy_to_iter() is available */ /* #undef HAVE_COPY_TO_ITER */ @@ -502,6 +517,9 @@ /* Define to 1 if you have the `issetugid' function. */ #define HAVE_ISSETUGID 1 +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + /* kernel has kernel_fpu_* functions */ /* #undef HAVE_KERNEL_FPU */ @@ -664,6 +682,9 @@ /* register_shrinker is vararg */ /* #undef HAVE_REGISTER_SHRINKER_VARARG */ +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + /* iops->rename2() exists */ /* #undef HAVE_RENAME2 */ @@ -1074,7 +1095,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_ge96fbdba3" +#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_g62677576a" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1083,7 +1104,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "6.4" +#define ZFS_META_KVER_MAX "6.5" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "3.10" @@ -1104,7 +1125,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_ge96fbdba3" +#define ZFS_META_RELEASE "FreeBSD_g62677576a" /* Define the project version. */ #define ZFS_META_VERSION "2.2.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index f29b7621500d..9b7204050397 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.0-rc4-1-ge96fbdba3" +#define ZFS_META_GITREV "zfs-2.2.0-rc4-20-g62677576a"