diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-05-23 12:22:58 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-05-23 12:22:58 +0000 |
commit | 042c1410d620ae83434d9daae3758ab5bb481ccd (patch) | |
tree | 5b7ca798df999360f93068e176216f282df106c3 /exception_lists | |
parent | 32ee299ad58df1d937344b3b5a4b5098add86ff9 (diff) | |
parent | 591fabec62bd160b1db9b1f20972c9bca1d8a0b6 (diff) | |
download | illumos-joyent-042c1410d620ae83434d9daae3758ab5bb481ccd.tar.gz |
[illumos-gate merge]
commit 591fabec62bd160b1db9b1f20972c9bca1d8a0b6
6977 ixgb package should not refer to ixgbe's license
6976 ixgb package should not ship ixgbe's manual page
commit 64d07b7cd791cb277b72edd9f8c4373ca6477850
4057 Add sfxge support (fix Makefile typo)
commit 49ef7e0638c8b771d8a136eae78b1c0f99acc8e0
4057 Add sfxge support
Conflicts:
usr/src/uts/common/Makefile.files
exception_lists/cstyle
Diffstat (limited to 'exception_lists')
-rw-r--r-- | exception_lists/cstyle | 59 |
1 files changed, 58 insertions, 1 deletions
diff --git a/exception_lists/cstyle b/exception_lists/cstyle index a85d5249fa..4fb4f616bf 100644 --- a/exception_lists/cstyle +++ b/exception_lists/cstyle @@ -1089,7 +1089,6 @@ 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_x540.c -usr/src/uts/common/io/ixgbe/core/ixgbe_x540.h 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 @@ -1126,6 +1125,64 @@ usr/src/uts/common/io/nfp/nfp_hostif.h usr/src/uts/common/io/nfp/nfdev-common.h usr/src/uts/common/io/nfp/autoversion.h usr/src/uts/common/io/nfp/i21285.h +usr/src/uts/common/io/sfxge/common/ef10_ev.c +usr/src/uts/common/io/sfxge/common/ef10_filter.c +usr/src/uts/common/io/sfxge/common/ef10_impl.h +usr/src/uts/common/io/sfxge/common/ef10_intr.c +usr/src/uts/common/io/sfxge/common/ef10_mac.c +usr/src/uts/common/io/sfxge/common/ef10_mcdi.c +usr/src/uts/common/io/sfxge/common/ef10_nic.c +usr/src/uts/common/io/sfxge/common/ef10_nvram.c +usr/src/uts/common/io/sfxge/common/ef10_phy.c +usr/src/uts/common/io/sfxge/common/ef10_rx.c +usr/src/uts/common/io/sfxge/common/ef10_tlv_layout.h +usr/src/uts/common/io/sfxge/common/ef10_tx.c +usr/src/uts/common/io/sfxge/common/ef10_vpd.c +usr/src/uts/common/io/sfxge/common/efx.h +usr/src/uts/common/io/sfxge/common/efx_bootcfg.c +usr/src/uts/common/io/sfxge/common/efx_check.h +usr/src/uts/common/io/sfxge/common/efx_crc32.c +usr/src/uts/common/io/sfxge/common/efx_ev.c +usr/src/uts/common/io/sfxge/common/efx_filter.c +usr/src/uts/common/io/sfxge/common/efx_hash.c +usr/src/uts/common/io/sfxge/common/efx_impl.h +usr/src/uts/common/io/sfxge/common/efx_intr.c +usr/src/uts/common/io/sfxge/common/efx_lic.c +usr/src/uts/common/io/sfxge/common/efx_mac.c +usr/src/uts/common/io/sfxge/common/efx_mcdi.c +usr/src/uts/common/io/sfxge/common/efx_mcdi.h +usr/src/uts/common/io/sfxge/common/efx_mon.c +usr/src/uts/common/io/sfxge/common/efx_nic.c +usr/src/uts/common/io/sfxge/common/efx_nvram.c +usr/src/uts/common/io/sfxge/common/efx_phy.c +usr/src/uts/common/io/sfxge/common/efx_phy_ids.h +usr/src/uts/common/io/sfxge/common/efx_port.c +usr/src/uts/common/io/sfxge/common/efx_regs.h +usr/src/uts/common/io/sfxge/common/efx_regs_ef10.h +usr/src/uts/common/io/sfxge/common/efx_regs_mcdi.h +usr/src/uts/common/io/sfxge/common/efx_regs_pci.h +usr/src/uts/common/io/sfxge/common/efx_rx.c +usr/src/uts/common/io/sfxge/common/efx_sram.c +usr/src/uts/common/io/sfxge/common/efx_tx.c +usr/src/uts/common/io/sfxge/common/efx_types.h +usr/src/uts/common/io/sfxge/common/efx_vpd.c +usr/src/uts/common/io/sfxge/common/efx_wol.c +usr/src/uts/common/io/sfxge/common/hunt_impl.h +usr/src/uts/common/io/sfxge/common/hunt_nic.c +usr/src/uts/common/io/sfxge/common/hunt_phy.c +usr/src/uts/common/io/sfxge/common/mcdi_mon.c +usr/src/uts/common/io/sfxge/common/mcdi_mon.h +usr/src/uts/common/io/sfxge/common/medford_impl.h +usr/src/uts/common/io/sfxge/common/medford_nic.c +usr/src/uts/common/io/sfxge/common/siena_flash.h +usr/src/uts/common/io/sfxge/common/siena_impl.h +usr/src/uts/common/io/sfxge/common/siena_mac.c +usr/src/uts/common/io/sfxge/common/siena_mcdi.c +usr/src/uts/common/io/sfxge/common/siena_nic.c +usr/src/uts/common/io/sfxge/common/siena_nvram.c +usr/src/uts/common/io/sfxge/common/siena_phy.c +usr/src/uts/common/io/sfxge/common/siena_sram.c +usr/src/uts/common/io/sfxge/common/siena_vpd.c usr/src/uts/common/sys/scsi/adapters/mpt_sas/mpi/mpi2.h usr/src/uts/common/sys/scsi/adapters/mpt_sas/mpi/mpi2_cnfg.h usr/src/uts/common/sys/scsi/adapters/mpt_sas/mpi/mpi2_hbd.h |