Merge commit '281819e5f8b19cd8627541a22d261906fd190276' into merges
commit7b7aaad8efe801b3fc0ad06569c8af74eec80ce3
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 00:15:44 +0000 (17 20:15 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 00:50:57 +0000 (17 20:50 -0400)
treec747e4c57ef2d325223c41d5d5bef751c82603c9
parent874aed23ec7c2366b70b6d047c5b608abb28f3ed
parent281819e5f8b19cd8627541a22d261906fd190276
Merge commit '281819e5f8b19cd8627541a22d261906fd190276' into merges
77 files changed:
include/sys/crypto/common.h
include/sys/crypto/impl.h
include/sys/crypto/ioctl.h
include/sys/crypto/spi.h
include/sys/ddi_impldefs.h
include/sys/ddimapreq.h
include/sys/pci.h
include/sys/types.h
kernel/net/ip/ipsecah.c
kernel/net/ip/ipsecesp.c
usr/src/boot/sys/boot/efi/loader/Makefile
usr/src/boot/sys/boot/i386/libi386/Makefile
usr/src/boot/sys/boot/i386/loader/Makefile
usr/src/cmd/krb5/kadmin/dbutil/dump.c
usr/src/cmd/sgs/libld/common/version.c
usr/src/common/ficl/loader.c
usr/src/lib/libc/port/inet/getnameinfo.c
usr/src/lib/libdns_sd/Makefile.com
usr/src/lib/libldap5/sources/ldap/common/tmplout.c
usr/src/lib/libm/common/C/atan2.c
usr/src/lib/libm/common/C/exp.c
usr/src/lib/libm/common/C/ilogb.c
usr/src/lib/libm/common/C/nextafter.c
usr/src/lib/libm/common/C/tanh.c
usr/src/lib/libm/common/LD/asinhl.c
usr/src/lib/libm/common/LD/j0l.c
usr/src/lib/libm/common/LD/nextafterl.c
usr/src/lib/libm/common/LD/tanhl.c
usr/src/lib/libm/common/R/atanf.c
usr/src/lib/libm/common/R/cosf.c
usr/src/lib/libm/common/R/ilogbf.c
usr/src/lib/libm/common/R/sincosf.c
usr/src/lib/libm/common/R/sinf.c
usr/src/lib/libm/common/R/tanf.c
usr/src/lib/libm/common/m9x/__fex_i386.c
usr/src/lib/libm/common/m9x/nexttowardl.c
usr/src/lib/libresolv2/common/bsd/mktemp.c
usr/src/lib/libresolv2/common/bsd/writev.c
usr/src/lib/libresolv2/common/dst/hmac_link.c
usr/src/lib/libresolv2/common/irs/dns_pr.c
usr/src/lib/libresolv2/common/irs/dns_sv.c
usr/src/lib/libresolv2/common/irs/gen_ng.c
usr/src/lib/libresolv2/common/irs/gethostent_r.c
usr/src/lib/libresolv2/common/irs/getnetent_r.c
usr/src/lib/libresolv2/common/irs/getnetgrent_r.c
usr/src/lib/libresolv2/common/irs/getprotoent_r.c
usr/src/lib/libresolv2/common/irs/getservent_r.c
usr/src/lib/libresolv2/common/irs/hesiod.c
usr/src/lib/libresolv2/common/irs/irp_ho.c
usr/src/lib/libresolv2/common/irs/irp_nw.c
usr/src/lib/libresolv2/common/irs/irp_pr.c
usr/src/lib/libresolv2/common/irs/irpmarshall.c
usr/src/lib/libresolv2/common/irs/irs_data.c
usr/src/lib/libresolv2/common/irs/lcl_ho.c
usr/src/lib/libresolv2/common/irs/lcl_ng.c
usr/src/lib/libresolv2/common/irs/lcl_nw.c
usr/src/lib/libresolv2/common/irs/lcl_pr.c
usr/src/lib/libresolv2/common/isc/eventlib.c
usr/src/lib/libresolv2/common/isc/heap.c
usr/src/lib/libresolv2/common/resolv/res_debug.c
usr/src/lib/libresolv2/common/resolv/res_findzonecut.c
usr/src/lib/libresolv2/common/resolv/res_init.c
usr/src/lib/libresolv2/common/resolv/res_mkupdate.c
usr/src/lib/madv/common/madv.c
usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
usr/src/lib/pkcs11/pkcs11_softtoken/common/softAESCrypt.c
usr/src/lib/pkcs11/pkcs11_softtoken/common/softSlotToken.c
usr/src/lib/smhba/common/SMHBAAPILIB.c
usr/src/pkg/manifests/system-kernel.man2.inc
usr/src/test/crypto-tests/tests/common/Makefile
usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs
usr/src/uts/common/crypto/core/kcf_cryptoadm.c
usr/src/uts/common/crypto/io/aes.c
usr/src/uts/common/crypto/io/crypto.c
usr/src/uts/common/crypto/io/dprov.c
usr/src/uts/i86pc/io/rootnex.c
usr/src/uts/intel/io/pci/pci_boot.c