From nobody Tue Oct 28 21:23:37 2025 X-Original-To: dev-commits-src-branches@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 4cx3Jp33Fyz6DVHk; Tue, 28 Oct 2025 21:23:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx3Jn57vXz3l0c; Tue, 28 Oct 2025 21:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761686617; 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=Fn+hrkT5wUj9X883uL/oLOOTDWSi0GcUTAGMKkuzGH8=; b=H8YoSA+zhGCqWUXPE+7aa834oZ5hU6W569dOsjqgHhq6M8vjezfSWOPxh66bfuB+t/HLXm 9UXZ95LzaIZnWd2IUw+HlX07cwMzWnfZU/HSloMNnsDPYPY27g97LfjisIj0rDcCvnWOjy cxzYosCmDgFH33EXc+5rP+TUDF9bhBarBgjEp0TAijXo8Jvdz9i4i/YpK5TFkn9yxjwR6x 2HWGRxZZRdSEtG2EANBtX6iSfh3/s645yy9y2kJeX5EeenXbwBBw01hz0pdH5vUyzbp5FZ QAw6p3qOj4/Mykmi7QKvU4eOZpyFBAMYx1SIdYMXh5yDDtoBJyDH/qE0VB2Dfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761686617; 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=Fn+hrkT5wUj9X883uL/oLOOTDWSi0GcUTAGMKkuzGH8=; b=C4wZf04x3NgZ9g65sw7x0mmgsUuWnl2tud1I/mOXa7oYHhHCHNXNpS7zKT9hb4ocAq9wtT CtlEwhVksPIi0bSROI+UsJmMauU9mYzHLlmgT4YKuNH3tfpIIsz+mFvQjLLw2rQ583wdTs 52f7eWJ3Gd0Ht5Xkvj1S3vdzTeqP08fuNS4bFiZOefRVYwfSe/HBbcdVwPUYMwRTor28Yp sJmmP5L+KoGefJu5RXsTh6K9Xbz1VsSbKLNqyEPeeauqNLtVDBa3f0mg4YEBn0+VwKVdg2 8bZsVFr5pIsDgay54S4B8PXPLp4ICe30r0hZG1Ik2vTVYtBiXs/JC7SvKsNCRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761686617; a=rsa-sha256; cv=none; b=DRwOApvt9noM8jV+diriWLuKMeQ6Y25u3pssYVoZR9QuP9ko/bC01EUJ1yM/+gMgnnTBLc hC/02axBrw5lW+zldRZ08a01Wr1qjOf32cpzo8qzWbZtyp9feVM7a+a7qdHFlJMEODY6Kd tWVNQf1P6Er9d6JdRM4dYkhtYrL9qPTPEZuD33AkgJStBlwS53IHajHKkz1cCP7p3ZicBy Pu47dNbPdZ25vEE6iTAWFNVN2pOIV4QYspqEVq5GnmCCTwPPoSUuVr0JMFRIm4FKi0BWaS CP350LTHVUbnTOK0mU+wc0TazBigMgNrjQyvWThSarXA05YihBoQZXCtR9arVg== 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 4cx3Jn4h99z16S5; Tue, 28 Oct 2025 21:23:37 +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 59SLNbvl075508; Tue, 28 Oct 2025 21:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SLNbRt075505; Tue, 28 Oct 2025 21:23:37 GMT (envelope-from git) Date: Tue, 28 Oct 2025 21:23:37 GMT Message-Id: <202510282123.59SLNbRt075505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ed0083d08115 - releng/15.0 - zfs: update zfs_config.h and zfs_gitrev.h after ce7e1f86a (zfs-2.4.0-rc3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ed0083d08115f4cb64c05d6b74b286e45b75b733 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ed0083d08115f4cb64c05d6b74b286e45b75b733 commit ed0083d08115f4cb64c05d6b74b286e45b75b733 Author: Martin Matuska AuthorDate: 2025-10-25 09:16:36 +0000 Commit: Colin Percival CommitDate: 2025-10-28 21:22:53 +0000 zfs: update zfs_config.h and zfs_gitrev.h after ce7e1f86a (zfs-2.4.0-rc3) Approved by: re (cperciva) (cherry picked from commit 51d5e8c8ca0f3c8bdd26b042973b3dbe8f30d607) --- sys/modules/zfs/zfs_config.h | 17 +++++++++++++++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 35d79f08ede1..339182042915 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -204,6 +204,10 @@ /* 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 */ @@ -339,6 +343,9 @@ /* 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 */ @@ -510,6 +517,9 @@ /* 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 */ @@ -759,6 +769,9 @@ /* 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 */ @@ -843,7 +856,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.0-rc2-FreeBSD_g2f50d6740" +#define ZFS_META_ALIAS "zfs-2.4.0-rc3-FreeBSD_g814f9afba" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -873,7 +886,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "rc2-FreeBSD_g2f50d6740" +#define ZFS_META_RELEASE "rc3-FreeBSD_g814f9afba" /* Define the project version. */ #define ZFS_META_VERSION "2.4.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index b3bd4d7651b3..ba87aecc9751 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.0-rc2-0-g2f50d6740" +#define ZFS_META_GITREV "zfs-2.4.0-rc3-0-g814f9afba"