Merge commit '336970851eecf9c4348b3de7bbea0687059dd216'
commite7f249dec61d4d7ccf58767ea991103c0a1a7d14
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 22 Jan 2018 14:28:27 +0000 (22 09:28 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Mon, 22 Jan 2018 14:28:27 +0000 (22 09:28 -0500)
tree1e7cc76e6dd4898fb62f62956b22c66e3d87c68a
parentac157d2a9345935346b729db0ea9d5c7eb67cf9a
parent336970851eecf9c4348b3de7bbea0687059dd216
Merge commit '336970851eecf9c4348b3de7bbea0687059dd216'
include/sys/hook_event.h
include/sys/ksocket.h
include/sys/mac_flow.h
include/sys/neti.h
include/sys/scsi/adapters/iscsi_if.h
kernel/net/ilb/ilb_alg_rr.c
usr/src/uts/common/fs/smbclnt/netsmb/smb_subr.h