From owner-dev-commits-src-main@freebsd.org Wed Jun 30 06:34:08 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 BB8D565BAE0; Wed, 30 Jun 2021 06:34:08 +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 4GFBQ84dZ8z4VpT; Wed, 30 Jun 2021 06:34:08 +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 87C7327E73; Wed, 30 Jun 2021 06:34:08 +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 15U6Y8W3016930; Wed, 30 Jun 2021 06:34:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15U6Y8m8016927; Wed, 30 Jun 2021 06:34:08 GMT (envelope-from git) Date: Wed, 30 Jun 2021 06:34:08 GMT Message-Id: <202106300634.15U6Y8m8016927@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: 2617128a21bf - main - zfs: merge openzfs/zfs@4694131a0 (master) into main 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: 2617128a21bfb1b1e3065e54d46f9982d37c0bf8 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:34:08 -0000 The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2617128a21bfb1b1e3065e54d46f9982d37c0bf8 commit 2617128a21bfb1b1e3065e54d46f9982d37c0bf8 Merge: a00d703f2f43 4694131a0a05 Author: Martin Matuska AuthorDate: 2021-06-30 06:02:44 +0000 Commit: Martin Matuska CommitDate: 2021-06-30 06:02:44 +0000 zfs: merge openzfs/zfs@4694131a0 (master) into main Notable upstream pull request merges: #12253 module/zfs: simplify ddt_stat_add() loop #12288 Avoid 64bit division in multilist index functions Obtained from: OpenZFS OpenZFS commit: 4694131a0a05b6db2727c9801f9729b9378d3064 sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh | 2 +- .../openzfs/contrib/dracut/90zfs/zfs-lib.sh.in | 4 ++-- sys/contrib/openzfs/module/zfs/arc.c | 5 +++-- sys/contrib/openzfs/module/zfs/dbuf.c | 5 +++-- sys/contrib/openzfs/module/zfs/ddt.c | 4 ++-- sys/contrib/openzfs/module/zfs/dmu_objset.c | 10 +++++++++- sys/contrib/openzfs/module/zfs/metaslab.c | 7 ++++++- sys/contrib/openzfs/module/zstd/zfs_zstd.c | 19 +++++++++++++++++++ 9 files changed, 46 insertions(+), 12 deletions(-)