Skip to content
GitLab
Explore
Sign in
Register
HardenedBSD
HardenedBSD
Repository
HardenedBSD
cddl
lib
libzfs
Makefile
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master
· bd38a952
Shawn Webb
authored
Oct 21, 2021
Conflicts: sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c (unresolved)
bd38a952