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
..
2013-07-16 23:19:05 +00:00
2013-07-15 00:05:27 +00:00
2013-07-16 06:43:37 +00:00
2013-07-15 01:32:55 +00:00
2013-07-15 01:41:34 +00:00
2013-06-01 12:21:59 +00:00
2013-04-17 11:45:15 +00:00
2013-06-18 06:55:58 +00:00