diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-09-21 12:17:13 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-09-21 12:17:13 +0000 |
| commit | c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23 (patch) | |
| tree | 2c7012fec43602bc4e039c93c09acb858ed69c95 /cddl/lib | |
| parent | 440217b0af5ffa08086829f5902b01a92e7a6790 (diff) | |
| parent | c629f0bf62e351355716f9870d6c2e377584b016 (diff) | |
| download | src-c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23.tar.gz src-c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23.zip | |
zfs: merge openzfs/zfs@c629f0bf6
Notable upstream pull request merges:
#13725 Fix BLAKE3 tuneable and module loading on Linux and FreeBSD
#13756 FreeBSD: Organize sysctls
#13773 FreeBSD: add kqfilter support for zvol cdev
#13781 Importing from cachefile can trip assertion
#13794 Apply arc_shrink_shift to ARC above arc_c_min
#13798 Improve too large physical ashift handling
#13799 Revert "Avoid panic with recordsize > 128k, raw sending and
no large_blocks"
#13802 Add zfs.sync.snapshot_rename
#13831 zfs_enter rework
#13855 zfs recv hangs if max recordsize is less than received
recordsize
Obtained from: OpenZFS
OpenZFS commit: c629f0bf62e351355716f9870d6c2e377584b016
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/libuutil/Makefile | 1 | ||||
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 169b8d8afe01..fdbac6de2748 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -10,7 +10,6 @@ SRCS=\ uu_ident.c \ uu_list.c \ uu_misc.c \ - uu_pname.c \ uu_string.c WARNS?= 2 diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 92f1bda6d82a..b9ef6575c99a 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -119,7 +119,6 @@ KERNEL_C = \ sha256.c \ skein_zfs.c \ spa.c \ - spa_boot.c \ spa_checkpoint.c \ spa_config.c \ spa_errlog.c \ |