Merge commit '79c2b812ee2010ebf20fdd92dc5f06b59000a94c'
commitc64ea0b212d62c850e7e4f7f2d0eab396ddb5322
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 11 Jul 2018 16:44:02 +0000 (11 12:44 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 11 Jul 2018 16:44:02 +0000 (11 12:44 -0400)
tree195c44f6acb18fdfa0d1e758426b60a052781031
parenta038dd79377883c0869640f793da82ac3d40ef36
parent79c2b812ee2010ebf20fdd92dc5f06b59000a94c
Merge commit '79c2b812ee2010ebf20fdd92dc5f06b59000a94c'
kernel/fs/zfs/sys/uberblock_impl.h
usr/src/uts/common/io/nvme/nvme.c