From owner-dev-commits-src-main@freebsd.org Wed Jun 30 06:35:16 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 16B8E65BDAB; Wed, 30 Jun 2021 06:35:16 +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 4GFBRS0BZvz4WKD; Wed, 30 Jun 2021 06:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E3E8C27D1C; Wed, 30 Jun 2021 06:35:15 +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 15U6ZF5R017142; Wed, 30 Jun 2021 06:35:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15U6ZF7s017141; Wed, 30 Jun 2021 06:35:15 GMT (envelope-from git) Date: Wed, 30 Jun 2021 06:35:15 GMT Message-Id: <202106300635.15U6ZF7s017141@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: c0149d030023 - main - zfs: update zfs_config.h (missing in 2617128a2) 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: c0149d030023a8e4f7c4d668e95ad413ea7ac9db Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2021 06:35:16 -0000 The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c0149d030023a8e4f7c4d668e95ad413ea7ac9db commit c0149d030023a8e4f7c4d668e95ad413ea7ac9db Author: Martin Matuska AuthorDate: 2021-06-30 06:34:36 +0000 Commit: Martin Matuska CommitDate: 2021-06-30 06:34:36 +0000 zfs: update zfs_config.h (missing in 2617128a2) --- sys/modules/zfs/zfs_config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index ae32a588b104..7983ac8959e7 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -734,7 +734,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_g5e2c8338b" +#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_g4694131a0" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -743,7 +743,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "5.12" +#define ZFS_META_KVER_MAX "5.13" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "3.10" @@ -764,7 +764,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g5e2c8338b" +#define ZFS_META_RELEASE "FreeBSD_g4694131a0" /* Define the project version. */ #define ZFS_META_VERSION "2.1.99"