From nobody Sat Oct 14 22:35:42 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 4S7J9p5Zrtz4xL1Y; Sat, 14 Oct 2023 22:35:42 +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 4S7J9p4VNLz3LyP; Sat, 14 Oct 2023 22:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697322942; 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=Orgzqqe2iZEXgYqP7ZRuOrWArAXFJg2HJKC14KZTjoQ=; b=dfos3fj0s7hX/6QZYlIVQ2xUqjDT8OHku9thXHTvhw8dpX7toWXQ1PGqQ7RK0A4As5yeve QFJw8If9w/bqLR9qbBYacJd269I7CADNMFy6E9/8p2xAifn+de5hhoaPmxxu/Qbv3K0EmZ ginlSl8K9pq8fxBK/uGAKlN1bm+nWMbVbqxU89F7T4y7J4oHxOwL/AXN4Z7HFbGE5m8H5g lQ0JwJBmVxAkrSsjrlgZJPsuohg2dJy4tjW4mVzk/zoVowxrHByHQZ1h7hf6krsllwDqyv WkJbHNai8f+PbFw1HYsed/+MV+jDvUI9bbfudLB1W2s9KaDkoda1eKOqvQPolg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697322942; a=rsa-sha256; cv=none; b=t8333jTDVLcHagBhQ2ou2dCu1aM7BQvl+uvYCq+THS/Ey0GDutWQ6CBJDGBc1cHaWh96sQ lzr7nNsfbS6D/Cx9bPQ/87ehHJcHh5zcUCvPe6vZX4sgz/RlxaIJ2JAjbDgoxTDb1x1Efs d8BlkhFbXeViEhuGsESgCag7ebFcw6YFALEU5PZUmoMuX8pdth/MIIab/hHPioAzZLinJB HuTAaH1URihWSw2UnwTBDv8Py4z9XEGIjRo0HTInSKa9nQpCNdzWUlEHfUZ3SXxRtE6cSe apnTmYadBhxA97bbyGcXtQ1vKg85nOII6HM2pg6wwywe0iONtuI2DXfjgbrinw== 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=1697322942; 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=Orgzqqe2iZEXgYqP7ZRuOrWArAXFJg2HJKC14KZTjoQ=; b=LrfIE1BF1UUTA/59peeFec2ulLkyXfzK/zZ5BrM0t8Bz0OXRsAHnF5f+vQhiW6v/C1s7eH aOoYWuFnrKhBt/3wwejfags7lO/xeYdikmG6r9IKyMMvjJVadzqlTdCqCxefs+ENcu9/+0 2+ynrLF8CA68R/g/CKdh0GUcmBRy/m4N4gOXgI/D7UT9mujwmIYlNNjjBwPnVr0k367zw0 lwspPYFLLGY5GAbbO/Tbk1EuY4vVMowqiXB7Sg60lqMqsRg6ojwbc+pGdyKa51+7DwBSMR KAUyaXj0a7rBR4OrbZTz1QItawrfQbtxXU6iC5UBqv+fnH/H92fStwZl5e+ORA== 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 4S7J9p3Ln1zp2K; Sat, 14 Oct 2023 22:35:42 +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 39EMZgYA095077; Sat, 14 Oct 2023 22:35:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39EMZgfW095074; Sat, 14 Oct 2023 22:35:42 GMT (envelope-from git) Date: Sat, 14 Oct 2023 22:35:42 GMT Message-Id: <202310142235.39EMZgfW095074@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: 3ac9fb49cc1c - releng/14.0 - zfs: merge openzfs/zfs@95785196f (zfs-2.2-release) into stable/14 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3ac9fb49cc1c3d6034a449471df7ba2d24f26089 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3ac9fb49cc1c3d6034a449471df7ba2d24f26089 commit 3ac9fb49cc1c3d6034a449471df7ba2d24f26089 Author: Martin Matuska AuthorDate: 2023-10-14 18:24:39 +0000 Commit: Martin Matuska CommitDate: 2023-10-14 20:52:48 +0000 zfs: merge openzfs/zfs@95785196f (zfs-2.2-release) into stable/14 OpenZFS release 2.2.0 This commit adjusts the version numbers only. Obtained from: OpenZFS OpenZFS commit: 95785196f26e92d82cf4445654ba84e4a9671c57 OpenZFS tag: zfs-2.2.0 Approved by: re (gjb) (cherry picked from commit b2d6bc7597ebff8201c354a983a33149d1e1ef97) --- sys/contrib/openzfs/META | 2 +- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/META b/sys/contrib/openzfs/META index 4178f1b5daa4..0d7df10d47db 100644 --- a/sys/contrib/openzfs/META +++ b/sys/contrib/openzfs/META @@ -2,7 +2,7 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 2.2.0 -Release: rc5 +Release: 1 Release-Tags: relext License: CDDL Author: OpenZFS diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index b62dbf112b31..9c423a3e3e36 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1095,7 +1095,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_g2bba9fd47" +#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_g95785196f" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1125,7 +1125,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g2bba9fd47" +#define ZFS_META_RELEASE "FreeBSD_g95785196f" /* 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 db30da19109e..d1341d6a39ef 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-rc5-14-g2bba9fd47" +#define ZFS_META_GITREV "zfs-2.2.0-0-g95785196f"