diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-28 12:14:00 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-28 12:14:00 +0000 |
| commit | 0addc7d257b80cf74317c2b7491a9ff393a277ce (patch) | |
| tree | 609fd4c726e014cb101fc9c4be3a8c2c0368a0d9 /exception_lists/cstyle | |
| parent | 8f78817ba2018a5f76ebe78b251e2ad4b5b35457 (diff) | |
| parent | dc0cb1cda72a989d92d813e487cdff59f629aa3f (diff) | |
| download | illumos-joyent-0addc7d257b80cf74317c2b7491a9ff393a277ce.tar.gz | |
[illumos-gate merge]
commit dc0cb1cda72a989d92d813e487cdff59f629aa3f
6064 ixgbe needs X550 support
commit 2e1aefd1b4539a3d6cf03dbfa515eabf4de09f59
7223 grub "setup" built-in broken by 6593
Conflicts:
exception_lists/hdrchk
exception_lists/cstyle
Diffstat (limited to 'exception_lists/cstyle')
| -rw-r--r-- | exception_lists/cstyle | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/exception_lists/cstyle b/exception_lists/cstyle index 6fdc23f42a..fc7f42e215 100644 --- a/exception_lists/cstyle +++ b/exception_lists/cstyle @@ -1080,29 +1080,24 @@ usr/src/uts/common/io/ixgbe/core/ixgbe_api.c usr/src/uts/common/io/ixgbe/core/ixgbe_api.h usr/src/uts/common/io/ixgbe/core/ixgbe_common.c usr/src/uts/common/io/ixgbe/core/ixgbe_common.h +usr/src/uts/common/io/ixgbe/core/ixgbe_dcb.c +usr/src/uts/common/io/ixgbe/core/ixgbe_dcb.h +usr/src/uts/common/io/ixgbe/core/ixgbe_dcb_82598.c +usr/src/uts/common/io/ixgbe/core/ixgbe_dcb_82598.h +usr/src/uts/common/io/ixgbe/core/ixgbe_dcb_82599.c +usr/src/uts/common/io/ixgbe/core/ixgbe_dcb_82599.h usr/src/uts/common/io/ixgbe/core/ixgbe_mbx.c usr/src/uts/common/io/ixgbe/core/ixgbe_mbx.h usr/src/uts/common/io/ixgbe/core/ixgbe_osdep.h usr/src/uts/common/io/ixgbe/core/ixgbe_phy.c usr/src/uts/common/io/ixgbe/core/ixgbe_phy.h usr/src/uts/common/io/ixgbe/core/ixgbe_type.h +usr/src/uts/common/io/ixgbe/core/ixgbe_vf.c +usr/src/uts/common/io/ixgbe/core/ixgbe_vf.h usr/src/uts/common/io/ixgbe/core/ixgbe_x540.c -usr/src/uts/common/io/ixgbe/ixgbe_82598.c -usr/src/uts/common/io/ixgbe/ixgbe_82598.h -usr/src/uts/common/io/ixgbe/ixgbe_82599.c -usr/src/uts/common/io/ixgbe/ixgbe_82599.h -usr/src/uts/common/io/ixgbe/ixgbe_api.c -usr/src/uts/common/io/ixgbe/ixgbe_api.h -usr/src/uts/common/io/ixgbe/ixgbe_common.c -usr/src/uts/common/io/ixgbe/ixgbe_common.h -usr/src/uts/common/io/ixgbe/ixgbe_mbx.c -usr/src/uts/common/io/ixgbe/ixgbe_mbx.h -usr/src/uts/common/io/ixgbe/ixgbe_osdep.h -usr/src/uts/common/io/ixgbe/ixgbe_phy.c -usr/src/uts/common/io/ixgbe/ixgbe_phy.h -usr/src/uts/common/io/ixgbe/ixgbe_type.h -usr/src/uts/common/io/ixgbe/ixgbe_x540.c -usr/src/uts/common/io/ixgbe/ixgbe_x540.h +usr/src/uts/common/io/ixgbe/core/ixgbe_x540.h +usr/src/uts/common/io/ixgbe/core/ixgbe_x550.c +usr/src/uts/common/io/ixgbe/core/ixgbe_x550.h usr/src/uts/common/io/nfp/ usr/src/uts/common/io/nfp/osif.c usr/src/uts/common/io/nfp/nfp.h |