Merge commit '45d3dd981abb9025d8ac994cf4cc8ce8cb1a9480' into merges
commit1343153662b6e16fb1ac95ae389c136d19eca2ec
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 21:10:06 +0000 (17 17:10 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 21:20:32 +0000 (17 17:20 -0400)
treee934020c84a2a38bea5e19b684f23b58710076cd
parent854468e7f085c2a6dff7cdb0c45351c03a77cb57
parent45d3dd981abb9025d8ac994cf4cc8ce8cb1a9480
Merge commit '45d3dd981abb9025d8ac994cf4cc8ce8cb1a9480' into merges
28 files changed:
exception_lists/copyright
exception_lists/packaging
include/sys/dld.h
include/sys/mac_impl.h
include/sys/mac_provider.h
kernel/drivers/net/i40e/i40e_gld.c
kernel/drivers/net/ixgbe/Makefile
kernel/drivers/net/ixgbe/ixgbe_gld.c
kernel/drivers/net/ixgbe/ixgbe_main.c
kernel/drivers/net/ixgbe/ixgbe_sw.h
kernel/drivers/net/ixgbe/ixgbe_transceiver.c
share/man/man9e/Makefile
share/man/man9e/mac_capab_transceiver.9e
share/man/man9f/Makefile
share/man/man9f/mac_transceiver_info.9f
usr/src/cmd/Makefile
usr/src/lib/Makefile
usr/src/lib/fm/topo/modules/Makefile.plugin
usr/src/pkg/manifests/service-fault-management.mf
usr/src/pkg/manifests/system-kernel.man9e.inc
usr/src/pkg/manifests/system-kernel.man9f.inc
usr/src/pkg/manifests/system-library.mf
usr/src/pkg/manifests/system-network.mf
usr/src/pkg/manifests/system-test-utiltest.mf
usr/src/test/util-tests/runfiles/default.run
usr/src/test/util-tests/tests/Makefile
usr/src/uts/common/Makefile.files
usr/src/uts/common/io/mac/mac.c