Merge pull request #185 from truenas/truenas/zfs-2.2.1-release-brt

Sync with upstream zfs-2.2.1 release

.cirrus.yml

@@ -0,0 +1,21 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+  ARCH: amd64
+
+build_task:
+  matrix:
+    freebsd_instance:
+      image_family: freebsd-12-4
+    freebsd_instance:
+      image_family: freebsd-13-2
+    freebsd_instance:
+      image_family: freebsd-14-0-snap
+  prepare_script:
+    - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py39-packaging py39-cffi py39-sysctl
+  configure_script:
+    - env MAKE=gmake ./autogen.sh
+    - env MAKE=gmake ./configure --with-config="user" --with-python=3.9
+  build_script:
+    - gmake -j `sysctl -n kern.smp.cpus`
+  install_script:
+    - gmake install

.gitignore

@@ -42,8 +42,10 @@
 !udev/**
 
 !.editorconfig
+!.cirrus.yml
 !.gitignore
 !.gitmodules
+!.mailmap
 !AUTHORS
 !autogen.sh
 !CODE_OF_CONDUCT.md
@@ -60,7 +62,6 @@
 !TEST
 !zfs.release.in
 
-
 #
 # Normal rules
 #

.mailmap

@@ -0,0 +1,189 @@
+# This file maps the name+email seen in a commit back to a canonical
+# name+email. Git will replace the commit name/email with the canonical version
+# wherever it sees it.
+#
+# If there is a commit in the history with a "wrong" name or email, list it
+# here. If you regularly commit with an alternate name or email address and
+# would like to ensure that you are always listed consistently in the repo, add
+# mapping here.
+#
+# On the other hand, if you use multiple names or email addresses legitimately
+# (eg you use a company email address for your paid OpenZFS work, and a
+# personal address for your evening side projects), then don't map one to the
+# other here.
+#
+# The most common formats are:
+#
+# Canonical Name <canonical-email>
+# Canonical Name <canonical-email> <commit-email>
+# Canonical Name <canonical-email> Commit Name <commit-email>
+#
+# See https://git-scm.com/docs/gitmailmap for more info.
+
+# These maps are making names consistent where they have varied but the email
+# address has never changed. In most cases, the full name is in the
+# Signed-off-by of a commit with a matching author.
+Ahelenia Ziemiańska <[email protected]>
+Ahelenia Ziemiańska <[email protected]>
+Alex John <[email protected]>
+Andreas Dilger <[email protected]>
+Andrew Walker <[email protected]>
+Benedikt Neuffer <[email protected]>
+Chengfei Zhu <[email protected]>
+Chris Lindee <[email protected]>
+Colm Buckley <[email protected]>
+Crag Wang <[email protected]>
+Damian Szuberski <[email protected]>
+Daniel Kolesa <[email protected]>
+Debabrata Banerjee <[email protected]>
+Finix Yan <[email protected]>
+Gaurav Kumar <[email protected]>
+Gionatan Danti <[email protected]>
+Glenn Washburn <[email protected]>
+Gordan Bobic <[email protected]>
+Gregory Bartholomew <[email protected]>
+hedong zhang <[email protected]>
+InsanePrawn <[email protected]>
+Jason Cohen <[email protected]>
+Jason Harmening <[email protected]>
+Jeremy Faulkner <[email protected]>
+Jinshan Xiong <[email protected]>
+John Poduska <[email protected]>
+Justin Scholz <[email protected]>
+Ka Ho Ng <[email protected]>
+Kash Pande <[email protected]>
+Kay Pedersen <[email protected]>
+KernelOfTruth <[email protected]>
+Liu Hua <[email protected]>
+Liu Qing <[email protected]>
+loli10K <[email protected]>
+Matthias Blankertz <[email protected]>
+Michael Gmelin <[email protected]>
+Olivier Mazouffre <[email protected]>
+Piotr Kubaj <[email protected]>
+Quentin Zdanis <[email protected]>
+Roberto Ricci <[email protected]>
+Rob Norris <[email protected]>
+Rob Norris <[email protected]>
+Sam Lunt <[email protected]>
+Sanjeev Bagewadi <[email protected]>
+Stoiko Ivanov <[email protected]>
+Tamas TEVESZ <[email protected]>
+WHR <[email protected]>
+Yanping Gao <[email protected]>
+Youzhong Yang <[email protected]>
+
+# Commits from strange places, long ago
+Brian Behlendorf <[email protected]> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
+Brian Behlendorf <[email protected]> <behlendo@fedora-17-amd64.(none)>
+Brian Behlendorf <[email protected]> <behlendo@myhost.(none)>
+Brian Behlendorf <[email protected]> <[email protected]>
+Brian Behlendorf <[email protected]> <[email protected]>
+Herb Wartens <[email protected]> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
+Ned Bass <[email protected]> <bass6@zeno1.(none)>
+Tulsi Jain <[email protected]> <[email protected]>
+
+# Mappings from Github no-reply addresses
+ajs124 <[email protected]> <[email protected]>
+Alek Pinchuk <[email protected]> <[email protected]>
+Alexander Lobakin <[email protected]> <[email protected]>
+Alexey Smirnoff <[email protected]> <[email protected]>
+Allen Holl <[email protected]> <[email protected]>
+Ameer Hamza <[email protected]> <[email protected]>
+Andrew J. Hesford <[email protected]> <[email protected]>>
+Andrew Sun <[email protected]> <[email protected]>
+Aron Xu <[email protected]> <[email protected]>
+Arun KV <[email protected]> <[email protected]>
+Ben Wolsieffer <[email protected]> <[email protected]>
+bernie1995 <[email protected]> <[email protected]>
+Boris Protopopov <[email protected]> <[email protected]>
+Brad Forschinger <[email protected]> <[email protected]>
+Brandon Thetford <[email protected]> <[email protected]>
+buzzingwires <[email protected]> <[email protected]>
+Cedric Maunoury <[email protected]> <[email protected]>
+Charles Suh <[email protected]> <[email protected]>
+Dacian Reece-Stremtan <[email protected]> <[email protected]>
+Damian Szuberski <[email protected]> <[email protected]>
+Daniel Hiepler <[email protected]> <[email protected]>
+Daniel Kobras <[email protected]> <[email protected]>
+Daniel Reichelt <[email protected]> <[email protected]>
+David Quigley <[email protected]> <[email protected]>
+DHE <[email protected]> <[email protected]>
+Dmitri John Ledkov <[email protected]> <[email protected]>
+Dries Michiels <[email protected]> <[email protected]>
+Edmund Nadolski <[email protected]> <[email protected]>
+Érico Nogueira <[email protected]> <[email protected]>
+Fedor Uporov <[email protected]> <[email protected]>
+Felix Dörre <[email protected]> <[email protected]>
+Felix Neumärker <[email protected]> <[email protected]>
+Finix Yan <[email protected]> <[email protected]>
+Gaurav Kumar <[email protected]> <[email protected]>
+George Gaydarov <[email protected]> <[email protected]>
+Georgy Yakovlev <[email protected]> <[email protected]>
+Gerardwx <[email protected]> <[email protected]>
+Gian-Carlo DeFazio <[email protected]> <[email protected]>
+Giuseppe Di Natale <[email protected]> <[email protected]>
+Hajo Möller <[email protected]> <[email protected]>
+Harry Mallon <[email protected]> <[email protected]>
+Hiếu Lê <[email protected]> <[email protected]>
+Jake Howard <[email protected]> <[email protected]>
+James Cowgill <[email protected]> <[email protected]>
+Jason King <[email protected]> <[email protected]>
+Jeff Dike <[email protected]> <[email protected]>
+Jitendra Patidar <[email protected]> <[email protected]>
+João Carlos Mendes Luís <[email protected]> <[email protected]>
+John Eismeier <[email protected]> <[email protected]>
+John L. Hammond <[email protected]> <[email protected]>
+John-Mark Gurney <[email protected]> <[email protected]>
+John Ramsden <[email protected]> <[email protected]>
+Jonathon Fernyhough <[email protected]> <[email protected]>
+Justin Hibbits <[email protected]> <[email protected]>
+Kevin Jin <[email protected]> <[email protected]>
+Kevin P. Fleming <[email protected]> <[email protected]>
+Krzysztof Piecuch <[email protected]> <[email protected]>
+Kyle Evans <[email protected]> <[email protected]>
+Laurențiu Nicola <[email protected]> <[email protected]>
+loli10K <[email protected]> <[email protected]>
+Lorenz Hüdepohl <[email protected]> <[email protected]>
+Luís Henriques <[email protected]> <[email protected]>
+Marcin Skarbek <[email protected]> <[email protected]>
+Matt Fiddaman <[email protected]> <[email protected]>
+Max Zettlmeißl <[email protected]> <[email protected]>
+Michael Niewöhner <[email protected]> <[email protected]>
+Michael Zhivich <[email protected]> <[email protected]>
+Mo Zhou <[email protected]> <[email protected]>
+Nick Mattis <[email protected]> <[email protected]>
+omni <[email protected]> <[email protected]>
+Pablo Correa Gómez <[email protected]> <[email protected]>
+Paul Zuchowski <[email protected]> <[email protected]>
+Peter Ashford <[email protected]> <[email protected]>
+Peter Dave Hello <[email protected]> <[email protected]>
+Peter Wirdemo <[email protected]> <[email protected]>
+Petros Koutoupis <[email protected]> <[email protected]>
+Ping Huang <[email protected]> <[email protected]>
+Piotr P. Stefaniak <[email protected]> <[email protected]>
+Richard Allen <[email protected]> <[email protected]>
+Rich Ercolani <[email protected]> <[email protected]>
+Rob Wing <[email protected]> <[email protected]>
+Roman Strashkin <[email protected]> <[email protected]>
+Ryan Hirasaki <[email protected]> <[email protected]>
+Samuel Wycliffe J <[email protected]> <[email protected]>
+Samuel Wycliffe <[email protected]> <[email protected]>
+Savyasachee Jha <[email protected]> <[email protected]>
+Scott Colby <[email protected]> <[email protected]>
+Sean Eric Fagan <[email protected]> <[email protected]>
+Spencer Kinny <[email protected]> <[email protected]>
+Srikanth N S <[email protected]> <[email protected]>
+Thomas Geppert <[email protected]> <[email protected]>
+Tim Crawford <[email protected]> <[email protected]>
+Tom Matthews <[email protected]> <[email protected]>
+Tony Perkins <[email protected]> <[email protected]>
+Torsten Wörtwein <[email protected]> <[email protected]>
+Tulsi Jain <[email protected]> <[email protected]>
+Václav Skála <[email protected]> <[email protected]>
+Violet Purcell <[email protected]> <[email protected]>
+Vipin Kumar Verma <[email protected]> <[email protected]>
+Wolfgang Bumiller <[email protected]> <[email protected]>
+xtouqh <[email protected]> <[email protected]>
+Yuri Pankov <[email protected]> <[email protected]>
+Yuri Pankov <[email protected]> <[email protected]>