Fix mismerge and add NVME xport support to devstat (or rather, exclude it from SCSI).
MFC after: 1 week