freebsd-skq/cddl
Xin LI c92bc5e996 Manually merge part of vendor import r238583 from Illumos.
Illumos changeset: 13680:2bd022a765e2
Illumos ZFS issue:

    2671 zpool import should not fail if vdev ashift has increased

MFC after:	3 days
2013-07-18 00:22:42 +00:00
..
compat/opensolaris Fix an obvious typo. 2012-07-04 17:36:26 +00:00
contrib Manually merge part of vendor import r238583 from Illumos. 2013-07-18 00:22:42 +00:00
lib Bring back part of r249367 by adding DTrace's temporal option, which allows 2013-05-12 16:26:33 +00:00
sbin WiP merge of libzfs_core (MFV r238590, r238592) 2013-03-05 08:09:53 +00:00
usr.bin WiP merge of libzfs_core (MFV r238590, r238592) 2013-03-05 08:09:53 +00:00
usr.sbin WiP merge of libzfs_core (MFV r238590, r238592) 2013-03-05 08:09:53 +00:00
Makefile Apply a set of style.Makefile(5) changes to src/cddl/ makefiles. 2007-04-16 21:20:26 +00:00
Makefile.inc Do not lint code beyond necessity (with apologies to Wiliam of Ockham). 2010-11-18 16:32:52 +00:00