Merge commit '8cd3131235b232e4d63be3cf95ce9be87907e74f'
commit8bf11d57e8a75abdaf3920508686953cbd57cb56
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Thu, 23 Aug 2018 17:05:01 +0000 (23 13:05 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Thu, 23 Aug 2018 17:05:01 +0000 (23 13:05 -0400)
tree532f8601be7c863eac7a67b498d01a2fd4ed5338
parentd2b2683eafc539cc70a71b7877d11b8ffdec9979
parent8cd3131235b232e4d63be3cf95ce9be87907e74f
Merge commit '8cd3131235b232e4d63be3cf95ce9be87907e74f'
kernel/fs/proc/prvnops.c
kernel/fs/sockfs/socksyscalls.c
kernel/syscall/sendfile.c
usr/src/pkg/manifests/system-test-cryptotest.mf
usr/src/uts/common/io/nvme/nvme.c