diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-02-22 11:35:56 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-03-10 01:53:32 +0000 |
| commit | 57b9b81894e89f8fc686246618b3ac422a756641 (patch) | |
| tree | de4e84541768d482d77700bd906bb2d64e8c8fb6 /cddl | |
| parent | e295b9d9f598e08598725e9352140f03f4163129 (diff) | |
| download | src-57b9b81894e89f8fc686246618b3ac422a756641.tar.gz src-57b9b81894e89f8fc686246618b3ac422a756641.zip | |
zfs: merge OpenZFS master-9312e0fd1
Notable upstream changes:
778869fa1 Fix reporting of mount progress
e7adccf7f Disable use of hardware crypto offload drivers on FreeBSD
03e02e5b5 Fix checksum errors not being counted on repeated repair
64e0fe14f Restore FreeBSD resource usage accounting
11f2e9a49 Fix panic if scrubbing after removing a slog device
(cherry picked from commit ba27dd8be821792e15bdabfac69fd6cab0cf9dd3)
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 819f67ceec5a..6893e31ff20a 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -160,9 +160,9 @@ KERNEL_C = \ zfs_debug.c \ zfs_fm.c \ zfs_fuid.c \ - zfs_racct.c \ zfs_sa.c \ zfs_znode.c \ + zfs_racct.c \ zfs_ratelimit.c \ zfs_rlock.c \ zil.c \ |