Merge commit '6bb6b5762ca4b17cd5fb3c6c123f17489d5635aa' into merges
commit297cb10f3ea1b4e1366e54cb1a9657eb25c756d7
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 20 Jul 2018 20:16:18 +0000 (20 16:16 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 20 Jul 2018 20:16:18 +0000 (20 16:16 -0400)
treee18501dd50220c7c9abe46a1a72bd83d08c5abd4
parentab6fc1fc091a8a66e9af71851257adcf556534f1
parent6bb6b5762ca4b17cd5fb3c6c123f17489d5635aa
Merge commit '6bb6b5762ca4b17cd5fb3c6c123f17489d5635aa' into merges
28 files changed:
include/sys/dld.h
include/sys/mac.h
include/sys/mac_impl.h
include/sys/mac_provider.h
kernel/drivers/net/bnxe/Makefile
kernel/drivers/net/bnxe/bnxe.h
kernel/drivers/net/bnxe/bnxe_gld.c
kernel/drivers/net/bnxe/bnxe_illumos.c
kernel/drivers/net/e1000g/e1000g_main.c
kernel/drivers/net/e1000g/e1000g_sw.h
kernel/drivers/net/i40e/i40e_gld.c
kernel/drivers/net/i40e/i40e_sw.h
kernel/drivers/net/igb/igb_gld.c
kernel/drivers/net/igb/igb_sw.h
share/man/man9e/Makefile
share/man/man9e/mac_capab_led.9e
usr/src/Makefile.master
usr/src/cmd/Makefile.cmd
usr/src/cmd/pcitool/i386/Makefile
usr/src/lib/Makefile.lib
usr/src/lib/libdtrace/common/dt_link.c
usr/src/lib/libgen/common/reg_compile.c
usr/src/pkg/manifests/SUNWcs.man1.inc
usr/src/pkg/manifests/developer-build-onbld.mf
usr/src/pkg/manifests/system-kernel.man9e.inc
usr/src/pkg/manifests/system-network.mf
usr/src/tools/Makefile
usr/src/uts/common/io/mac/mac.c