Merge commit '2cedd8f0ecbd2b29bf0aac72bb8b7413b0326938' into merges
commit087844241176f9b9d9bea2a66f3a61f717ff67ee
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 19:57:41 +0000 (13 15:57 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 19:57:41 +0000 (13 15:57 -0400)
treecb1985bd4dc06ca70e379ad61b7f6f64f468ac7e
parenta22cf0373e95c14beef0b0bd317b7f4cec7fad72
parent2cedd8f0ecbd2b29bf0aac72bb8b7413b0326938
Merge commit '2cedd8f0ecbd2b29bf0aac72bb8b7413b0326938' into merges
27 files changed:
arch/x86/kernel/platform/i86pc/include/sys/apic.h
arch/x86/kernel/platform/i86pc/include/sys/apix.h
include/arpa/telnet.h
kernel/fs/zfs/dsl_destroy.c
kernel/fs/zfs/sys/dsl_pool.h
kernel/fs/zfs/sys/zfs_ioctl.h
kernel/fs/zfs/zcp.c
kernel/fs/zfs/zfs_ioctl.c
share/man/man8/ipadm.8
share/man/man8/zfs-program.8
usr/src/cmd/cmd-inet/usr.bin/pppd/ipv6cp.c
usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey.c
usr/src/cmd/format/main.c
usr/src/cmd/fs.d/zfs/fstyp/fstyp.c
usr/src/cmd/tar/tar.c
usr/src/lib/libc/port/threads/thr.c
usr/src/pkg/manifests/system-test-zfstest.mf
usr/src/uts/common/rpc/xdr_sizeof.c
usr/src/uts/i86pc/Makefile.files
usr/src/uts/i86pc/apix/Makefile
usr/src/uts/i86pc/io/apix/apix.c
usr/src/uts/i86pc/io/mp_platform_common.c
usr/src/uts/i86pc/io/mp_platform_misc.c
usr/src/uts/i86pc/io/pcplusmp/apic.c
usr/src/uts/i86pc/io/pcplusmp/apic_common.c
usr/src/uts/i86pc/io/rootnex.c
usr/src/uts/i86pc/pcplusmp/Makefile