Merge commit 'fdfb62c8fbf6e03ca943243b626360bede206f18'
commit35f8a7387d91896e7579775953eb4b0be6207773
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 28 Nov 2018 14:08:52 +0000 (28 09:08 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 28 Nov 2018 14:08:52 +0000 (28 09:08 -0500)
tree879bbe61b337fa9ff85749ee4f151dd4e8eb5d18
parent7a12d82b23a7dd03705e61cd302c5273f851cd44
parentfdfb62c8fbf6e03ca943243b626360bede206f18
Merge commit 'fdfb62c8fbf6e03ca943243b626360bede206f18'
arch/x86/kernel/ml/modstubs.s
share/man/man8/zfs-program.8
share/man/man8/zfs.8
usr/src/cmd/smbsrv/smbd/smbd_logon.c
usr/src/cmd/zfs/zfs_main.c
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/uts/common/Makefile.files