From nobody Sun Sep 24 08:29:01 2023 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 4RtfL54cTcz4tc8G; Sun, 24 Sep 2023 08:29: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 4RtfL544W7z3Z89; Sun, 24 Sep 2023 08:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695544141; 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=YN4Wev5cUFyZObmua8gfXXO14Scie7QGl35UKAsZVmY=; b=mBUKbPKMdhLk7P7CCrYqPvw9pb7Hiyr/Qig+DBtJSuXvdazt9CgMNIEM4ncc9YJaYh9mAz EllWPJoq/frpScPM7k78noXu1knW/zrj2zatRfAN5ZVM7D9btJBlJvikO7vW4eY9S6iNW7 xz8QTjg6hBk0JPtGeDxYuxbN47s41RHJM66mgKtO7yraLkT9JbL4+F+HchrQ+9hVwPHqpx pRCgw3TCsyw3GjN5hrOUVO9YKx8KgfS5mFv0kHyFqq7iVerc3R30qEhJVN/MbjUfQl8Z1L ElJ/tybH2OreA3vpK9cOP+y7Q9R0KxBpgnzO0qbRdwAA63Ldl/lu2KObM+Zd5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695544141; a=rsa-sha256; cv=none; b=pgPMcokftuq6UpcmYkT7hYzSMMe+x5raeSHV/Ajtxrtl5D2jBCC2kX1cmoO8rK3ijh33PD fvBEEiub59gCocvCrAzyr05t+MwJzy01ByCKrthY8vjETADK3wX8diD4s1Sz0m7sOecS1g SBCLQ3zIIi0CUKXhSLsg3iS+Cti/5RpQ5paJx5K2eLIJWYZx8nOoUuc6tISrsScAu/wQsF DBuo+tqSN7mIj1hDvWeEtv1rVIPoSz0iGMo6POHf6TsbzPECLxAAEnzmbNDbOiwQzRjqIT 5hZX8GTf62XvGcmiLQOmKxovk2vcZGyq0XfVcL0P7jyuzUJuNzU9+HojzxkwqQ== 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=1695544141; 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=YN4Wev5cUFyZObmua8gfXXO14Scie7QGl35UKAsZVmY=; b=e+TPS9mHNIrmMNOyeDZs9glgjPGHgtsURyVcAeGfhprM5BNe7wZYJAy4kXCfcqde6g5iIo nxA58/WYjj9lkQ8wWHV1EP0Z+qOgNBdDVfP1VstiwgK5yQuyo8IRVIdKoqx+YTJyLziGD3 djs7eaH5YzX1MQeSXQg9YyDhVqyqLekJ3WG5gZXXjHw5nVfqCcLtuqdNGrYqOR4tTihmt0 mVQzZ2grMfLc/H1WvZPK+k+S/1PNmcdfTCXiWwaeKri+YIlOHTO29rz6wmhjGaavLVH6lj blz6lWl34J6f4qW62FINS/IXmTZAFSrVCtvL2qc2HSb9lclNd5spYwRuFtYtxg== 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 4RtfL537xvzftl; Sun, 24 Sep 2023 08:29: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 38O8T19v097620; Sun, 24 Sep 2023 08:29:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38O8T1uc097617; Sun, 24 Sep 2023 08:29:01 GMT (envelope-from git) Date: Sun, 24 Sep 2023 08:29:01 GMT Message-Id: <202309240829.38O8T1uc097617@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: bb438c08b86a - stable/14 - zfs: update share/zfs/compatibility.d to match current ZFS code 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: bb438c08b86a32f13da16b2e7801f2cbd45bc5c1 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=bb438c08b86a32f13da16b2e7801f2cbd45bc5c1 commit bb438c08b86a32f13da16b2e7801f2cbd45bc5c1 Author: Martin Matuska AuthorDate: 2023-09-21 23:34:47 +0000 Commit: Martin Matuska CommitDate: 2023-09-24 08:27:38 +0000 zfs: update share/zfs/compatibility.d to match current ZFS code MFC after: 3 days (cherry picked from commit 7a0e9e3f8f3a9379df793284f719f1a7ee5734c2) --- cddl/share/zfs/compatibility.d/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile index e60bd172dcce..13d88fef184d 100644 --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -22,6 +22,7 @@ FILES= \ openzfs-2.0-linux \ openzfs-2.1-freebsd \ openzfs-2.1-linux \ + openzfs-2.2 \ zol-0.6.1 \ zol-0.6.4 \ zol-0.6.5 \ @@ -42,12 +43,17 @@ LINKS= \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.0 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.1 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.2 \ + ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.3 \ + ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.4 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freenas-11.3 \ ${FILESDIR}/freenas-11.0 ${FILESDIR}/freenas-11.1 \ ${FILESDIR}/openzfsonosx-1.9.3 ${FILESDIR}/openzfsonosx-1.9.4 \ ${FILESDIR}/openzfs-2.0-freebsd ${FILESDIR}/truenas-12.0 \ ${FILESDIR}/zol-0.7 ${FILESDIR}/ubuntu-18.04 \ - ${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04 + ${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04 \ + ${FILESDIR}/openzfs-2.1-linux ${FILESDIR}/ubuntu-22.04 \ + ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-linux \ + ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-freebsd LINKMODE= ${NOBINMODE}