Date: Wed, 30 Jun 2021 06:34:08 GMT From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 2617128a21bf - main - zfs: merge openzfs/zfs@4694131a0 (master) into main Message-ID: <202106300634.15U6Y8m8016927@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <mm@FreeBSD.org> AuthorDate: 2021-06-30 06:02:44 +0000 Commit: Martin Matuska <mm@FreeBSD.org> 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(-)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106300634.15U6Y8m8016927>