diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-11-16 13:56:03 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-11-16 13:56:03 +0000 |
| commit | a142ba1cb0758f1c8119b8460d2b7ec63441c626 (patch) | |
| tree | 1c888b33d5f46209e77cf0cb45426fe6e7197a1d /exception_lists/copyright | |
| parent | 2fbcca79e5f2eef09fec107dbeb20d643db90100 (diff) | |
| parent | 45d3dd981abb9025d8ac994cf4cc8ce8cb1a9480 (diff) | |
| download | illumos-joyent-a142ba1cb0758f1c8119b8460d2b7ec63441c626.tar.gz | |
[illumos-gate merge]
commit 45d3dd981abb9025d8ac994cf4cc8ce8cb1a9480
8699 Want NIC transceiver visibility
8700 ixgbe MAC_CAPAB_TRANSCEIVER support
8701 i40e MAC_CAPAB_TRANSCEIVER support
Conflicts:
usr/src/uts/common/sys/mac_provider.h
usr/src/uts/common/sys/mac_impl.h
usr/src/uts/common/sys/dld.h
usr/src/uts/common/io/mac/mac_provider.c
usr/src/uts/common/io/mac/mac.c
usr/src/uts/common/io/ixgbe/ixgbe_transceiver.c
usr/src/uts/common/io/ixgbe/ixgbe_gld.c
usr/src/uts/common/io/i40e/i40e_gld.c
usr/src/uts/common/io/dld/dld_drv.c
usr/src/test/util-tests/tests/libsff/Makefile
usr/src/test/util-tests/tests/Makefile
usr/src/test/util-tests/runfiles/default.run
usr/src/man/man9e/Makefile
usr/src/lib/libsff/common/libsff.c
usr/src/lib/fm/topo/modules/common/shared/topo_port.c
Diffstat (limited to 'exception_lists/copyright')
| -rw-r--r-- | exception_lists/copyright | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index 0f65caf5a3..c221ee35fb 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -410,6 +410,7 @@ usr/src/test/util-tests/tests/dis/*/*.out usr/src/test/util-tests/tests/libsff/*.out usr/src/test/util-tests/tests/grep_xpg4/files/gout* usr/src/test/util-tests/tests/grep_xpg4/files/test* +usr/src/test/util-tests/tests/libsff/*.out usr/src/test/zfs-tests/tests/functional/history/*Z usr/src/test/zfs-tests/tests/functional/history/*txt usr/src/tools/btxld/btx.h |