Revision 285139 broke "options ZFS" because of filename collisionCan we rename .c files in sys/contrib/libnv to avoid zfs libnv files dnvlist.c -> ldnvlist.c nvlist.c -> lnvlist.cnvpair.c -> lnvpair.c There is already bug 201356 for this. I confirmed it's working...