Merge pull request openzfs#438 from delphix/projects/merge-upstream/m…

…aster Merge remote-tracking branch '6.0/stage' into 'master'
pcd1193182 · May 18, 2022 · cbff55f · cbff55f
2 parents 1536a42 + 9df985e
commit cbff55f
Show file tree

Hide file tree

Showing 47 changed files with 576 additions and 521 deletions.
diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml
@@ -28,7 +28,7 @@ jobs:
         ./autogen.sh
     - name: Configure
       run: |
-        ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan
+        ./configure --enable-debug --enable-debuginfo
     - name: Make
       run: |
         make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod

diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml
@@ -24,7 +24,7 @@ jobs:
         ./autogen.sh
     - name: Configure
       run: |
-        ./configure --enable-debug --enable-debuginfo --enable-asan --enable-ubsan
+        ./configure --enable-debug --enable-debuginfo
     - name: Make
       run: |
         make -j$(nproc) --no-print-directory --silent pkg-utils pkg-kmod

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
@@ -8665,7 +8665,7 @@ main(int argc, char **argv)
 	};
 
 	while ((c = getopt_long(argc, argv,
-	    "a:AB:bcCdDeEf:Fg:GhiI:klLmMNo:Op:pPqrRsSt:TuU:vVx:XYyZz:",
+	    "a:AB:bcCdDeEf:Fg:GhiI:klLmMNo:Op:pPqrRsSt:T:uU:vVx:XYyZz:",
 	    long_options, NULL)) != -1) {
 		switch (c) {
 		case 'b':