Merge commit '7d815089a43a963b49eaddf97e514194ec29805b'
commitf239205e08c1bc4fec63dbe4ddcab8cfd63f188c
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 20 Aug 2018 16:22:50 +0000 (20 12:22 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 20 Aug 2018 17:06:43 +0000 (20 13:06 -0400)
treea2ddfc74851b6efbe24adbf1a817b28204c34a60
parentbe27e12fa80e9970e378e04a2488342fdbefac7a
parent7d815089a43a963b49eaddf97e514194ec29805b
Merge commit '7d815089a43a963b49eaddf97e514194ec29805b'
35 files changed:
exception_lists/packaging
kernel/fs/zfs/metaslab.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/spa_misc.c
kernel/fs/zfs/sys/metaslab.h
kernel/fs/zfs/sys/metaslab_impl.h
kernel/fs/zfs/sys/spa_impl.h
kernel/fs/zfs/sys/vdev_impl.h
kernel/fs/zfs/sys/zio.h
kernel/fs/zfs/vdev.c
kernel/fs/zfs/vdev_queue.c
kernel/fs/zfs/vdev_removal.c
kernel/fs/zfs/zil.c
kernel/fs/zfs/zio.c
usr/src/Makefile.master
usr/src/cmd/fs.d/smbclnt/smbutil/Makefile
usr/src/cmd/mdb/common/modules/zfs/zfs.c
usr/src/common/smbsrv/smb_door_legacy.c
usr/src/common/smbsrv/smb_token_xdr.c
usr/src/lib/Makefile
usr/src/lib/libmlrpc/Makefile.com
usr/src/lib/libmlrpc/amd64/Makefile
usr/src/lib/libmlrpc/i386/Makefile
usr/src/lib/libmlrpc/sparcv9/Makefile
usr/src/lib/libsmbfs/Makefile.com
usr/src/lib/libsmbfs/smb/file.c
usr/src/lib/smbsrv/Makefile
usr/src/lib/smbsrv/Makefile.targ
usr/src/lib/smbsrv/libmlsvc/common/netr_logon.c
usr/src/lib/smbsrv/libmlsvc/common/spoolss_svc.c
usr/src/pkg/manifests/service-file-system-smb.inc
usr/src/pkg/manifests/system-file-system-smb.inc
usr/src/uts/common/smbsrv/smb_door.h
usr/src/uts/common/smbsrv/smb_share.h
usr/src/uts/common/smbsrv/smb_xdr.h