aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/lib/libuutil
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2022-06-03 15:58:39 +0000
committerMartin Matuska <mm@FreeBSD.org>2022-06-03 16:17:53 +0000
commite3aa18ad71782a73d3dd9dd3d526bbd2b607ca16 (patch)
tree6c0de524d7951bac89d34ea7e67c7c8c87974c23 /sys/contrib/openzfs/lib/libuutil
parent645886d028c85b3cb9fb36e96b1edc661cf4c0d8 (diff)
parentb9d98453f9387c413f91d1d9cdb0cba8e04dbd95 (diff)
downloadsrc-e3aa18ad71782a73d3dd9dd3d526bbd2b607ca16.tar.gz
src-e3aa18ad71782a73d3dd9dd3d526bbd2b607ca16.zip
zfs: merge openzfs/zfs@b9d98453f
Notable upstream pull request merges: #12321 Fix inflated quiesce time caused by lwb_tx during zil_commit() #13244 zstd early abort #13360 Verify BPs as part of spa_load_verify_cb() #13452 More speculative prefetcher improvements #13466 Expose zpool guids through kstats #13476 Refactor Log Size Limit #13484 FreeBSD: libspl: Add locking around statfs globals #13498 Cancel in-progress rebuilds when we finish removal #13499 zed: Take no action on scrub/resilver checksum errors #13513 Remove wrong assertion in log spacemap Obtained from: OpenZFS OpenZFS commit: b9d98453f9387c413f91d1d9cdb0cba8e04dbd95
Diffstat (limited to 'sys/contrib/openzfs/lib/libuutil')
-rw-r--r--sys/contrib/openzfs/lib/libuutil/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/lib/libuutil/Makefile.am b/sys/contrib/openzfs/lib/libuutil/Makefile.am
index cb89d423dc48..339f9a064745 100644
--- a/sys/contrib/openzfs/lib/libuutil/Makefile.am
+++ b/sys/contrib/openzfs/lib/libuutil/Makefile.am
@@ -26,4 +26,4 @@ endif
libuutil_la_LDFLAGS += -version-info 3:0:0
-EXTRA_DIST += $(addprefix %D%/,libuutil.abi libuutil.suppr)
+dist_noinst_DATA += %D%/libuutil.abi %D%/libuutil.suppr