Merge commit '12014b724f98604d61f9756b7e199416475d7396' into merges
commitdc6b584abfe7688266c40651c4e8f43223715e10
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 00:21:02 +0000 (12 20:21 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 00:21:02 +0000 (12 20:21 -0400)
treeea824e14ad057ae66b4938195ea92a4d385458d2
parentf09c51c7021cffcfbe0b21b819490cde52b89ba7
parent12014b724f98604d61f9756b7e199416475d7396
Merge commit '12014b724f98604d61f9756b7e199416475d7396' into merges
20 files changed:
arch/x86/kernel/ml/modstubs.s
include/auth_list.h
include/inet/ipsec_impl.h
include/limits.h
include/sys/param.h
kernel/net/ip/keysock.c
kernel/net/ip/spdsock.c
share/man/man3/Intro.3
share/man/man4/exec_attr.4
share/man/man4/user_attr.4
usr/src/cmd/cmd-inet/usr.bin/netstat/netstat.c
usr/src/cmd/cmd-inet/usr.sbin/ping/ping.c
usr/src/cmd/cmd-inet/usr.sbin/traceroute/traceroute.c
usr/src/cmd/krb5/Makefile
usr/src/cmd/oamuser/user/funcs.c
usr/src/cmd/ptools/pfiles/pfiles.c
usr/src/lib/libsecdb/auth_attr.txt
usr/src/uts/common/io/ldterm.c
usr/src/uts/common/io/ptm.c
usr/src/uts/common/io/pts.c