Merge commit 'c057d312c6f715bb3aeadb653466e7046f26c4af'
commite646c0fedc5cd8d15d20204e5521938c92f26d60
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 1 Oct 2018 17:57:44 +0000 (1 13:57 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 1 Oct 2018 17:57:44 +0000 (1 13:57 -0400)
tree59ce4b847d15877753e510978138c5df4ad80166
parent4f8bd779609fe384fa1dc873a2f0d1c8bf016414
parentc057d312c6f715bb3aeadb653466e7046f26c4af
Merge commit 'c057d312c6f715bb3aeadb653466e7046f26c4af'
13 files changed:
include/sys/Makefile
include/sys/dkio.h
include/sys/dkioc_free_util.h
include/sys/scsi/targets/sddef.h
kernel/comstar/lu/stmf_sbd/sbd.c
kernel/comstar/lu/stmf_sbd/sbd_scsi.c
kernel/comstar/lu/stmf_sbd/stmf_sbd.h
kernel/drivers/scsi/targets/sd/sd.c
kernel/fs/zfs/zvol.c
kernel/os/dkioc_free_util.c
usr/src/pkg/manifests/system-header.mf
usr/src/uts/common/Makefile.files
usr/src/uts/common/io/sata/impl/sata.c