Merge commit '3d9b1a2a543845425f021c3f896a07b1deff87c9'
commitec37c6ec760db3b17079955559b6f50303d04ee5
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 22 Jan 2018 22:32:22 +0000 (22 17:32 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 22 Jan 2018 23:17:56 +0000 (22 18:17 -0500)
tree298e4260a0eaee4809cb8a2684e16a8f790395d3
parent76ec1c262de72cc1211f971d3a28354bd4d0349b
parent3d9b1a2a543845425f021c3f896a07b1deff87c9
Merge commit '3d9b1a2a543845425f021c3f896a07b1deff87c9'
13 files changed:
exception_lists/packaging
include/sys/Makefile
include/sys/nvme.h
include/sys/sunddi.h
include/sys/types32.h
share/man/man1m/Makefile
share/man/man1m/nvmeadm.1m
usr/src/cmd/Makefile
usr/src/cmd/mdb/common/modules/libc/libc.c
usr/src/cmd/nvmeadm/Makefile
usr/src/cmd/nvmeadm/nvmeadm_dev.c
usr/src/pkg/manifests/driver-storage-nvme.mf
usr/src/uts/common/io/asy.c