Merge commit '6e270ca825f06ec0e2d77db462b83074ec585f2f'
commit9143cf63cce5f4f4546cf7c9bbf113ef7fdbe598
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 23 Jan 2018 21:33:19 +0000 (23 16:33 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 23 Jan 2018 21:33:19 +0000 (23 16:33 -0500)
tree936e8278ebd9f8f76683e87f2590b2876f3ced89
parent5812a50449b625e89f7ffa21602a766519d76d87
parent6e270ca825f06ec0e2d77db462b83074ec585f2f
Merge commit '6e270ca825f06ec0e2d77db462b83074ec585f2f'
48 files changed:
include/arpa/nameser.h
include/arpa/nameser_compat.h
include/arpa/telnet.h
include/audio/au.h
include/config_admin.h
include/devid.h
include/dirent.h
include/dlfcn.h
include/floatingpoint.h
include/iso/limits_iso.h
include/langinfo.h
include/ldap.h
include/libelf.h
include/libzonecfg.h
include/listen.h
include/macros.h
include/ndpd.h
include/netdir.h
include/nl_types.h
include/nss_common.h
include/nsswitch.h
include/pkgdev.h
include/pkginfo.h
include/protocols/dumprestore.h
include/protocols/timed.h
include/regexp.h
include/resolv.h
include/rpcsvc/svc_dg_priv.h
include/rpcsvc/yp_prot.h
include/semaphore.h
include/shadow.h
include/stack_unwind.h
include/string.h
include/syms.h
include/synch.h
include/sys/socket.h
include/sys/ucode.h
include/thread_db.h
include/utmp.h
include/xti.h
kernel/fs/sockfs/sockcommon.c
kernel/fs/zfs/arc.c
lib/libc/recv.2
share/man/man3head/socket.h.3head
usr/src/cmd/mdb/common/mdb/mdb_termio.c
usr/src/pkg/manifests/system-test-ostest.mf
usr/src/test/os-tests/tests/sockfs/Makefile
usr/src/uts/i86pc/io/mp_platform_common.c