Merge commit '15ada8fc6dd9f38f563acc69f9f22f88a48b752a'
commit759550df5c5b6075bb214626e3b7f70c55cccd3d
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 20 Jan 2018 21:35:43 +0000 (20 16:35 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sat, 20 Jan 2018 21:35:49 +0000 (20 16:35 -0500)
tree6c2ca92e88191888590ce40defd2a491fe720045
parente4d79d4a697bce3e653ad5474883ba89b45dc763
parent15ada8fc6dd9f38f563acc69f9f22f88a48b752a
Merge commit '15ada8fc6dd9f38f563acc69f9f22f88a48b752a'
30 files changed:
include/sys/scsi/adapters/mpt_sas/mptsas_var.h
kernel/os/cap_util.c
kernel/zmod/adler32.c
kernel/zmod/crc32.c
kernel/zmod/crc32.h
kernel/zmod/deflate.c
kernel/zmod/deflate.h
kernel/zmod/inffast.c
kernel/zmod/inffast.h
kernel/zmod/inffixed.h
kernel/zmod/inflate.c
kernel/zmod/inflate.h
kernel/zmod/inftrees.c
kernel/zmod/inftrees.h
kernel/zmod/trees.c
kernel/zmod/zconf.h
kernel/zmod/zlib.h
kernel/zmod/zmod_subr.c
kernel/zmod/zutil.c
kernel/zmod/zutil.h
share/man/man7d/nvme.7d
usr/src/cmd/auditd/doorway.c
usr/src/cmd/cmd-inet/usr.sbin/in.routed/table.c
usr/src/pkg/manifests/system-test-libctest.mf
usr/src/pkg/manifests/system-test-utiltest.mf
usr/src/test/libc-tests/tests/Makefile
usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c
usr/src/uts/common/io/mr_sas/mr_sas_tbolt.c
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas_impl.c