diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-09-27 22:00:22 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-09-27 22:00:38 +0000 |
| commit | 6e9b3f5c7960aff925cedb83f71a64c153f8d89d (patch) | |
| tree | b47610110a3c95c340f735fa800927a587316828 /exception_lists | |
| parent | bfe86d8aef682dd2cc1970ba302b519789fcf539 (diff) | |
| parent | 6ed0a5cff079e25f4aa15cef67c6dd48ee60b018 (diff) | |
| download | illumos-joyent-6e9b3f5c7960aff925cedb83f71a64c153f8d89d.tar.gz | |
[illumos-gate merge]
commit 6ed0a5cff079e25f4aa15cef67c6dd48ee60b018
4090 igb I210/I211 support
commit 75eba5b6d79ed4d2ce3daf7b2806306b6b69a938
4091 e1000g I217/I218 support
4092 Intel 1GBe NIC common code should be shared
commit 80c94ecd7a524eb933a4bb221a9618b9dc490e76
3881 want device driver for HP SmartArray RAID controllers
commit 5e989a96186a37eb528fb7bb4d28a150874ec799
3830 SIGQUEUE_MAX's limit of 32 is too low
commit b9476f453004695da12eaaff383ed9005e7a47c4
4158 want getifaddrs manual page
Conflicts:
usr/src/man/man5/resource_controls.5
usr/src/man/man7d/cpqary3.7d
usr/src/pkg/manifests/driver-storage-cpqary3.mf
usr/src/uts/common/io/cpqary3/cpqary3.c
usr/src/uts/common/Makefile.files
usr/src/uts/intel/cpqary3/Makefile
Manifests:
usr/src/pkg/manifests/driver-network-e1000g.mf
usr/src/pkg/manifests/driver-network-igb.mf
Diffstat (limited to 'exception_lists')
| -rw-r--r-- | exception_lists/cstyle | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/exception_lists/cstyle b/exception_lists/cstyle index 28624d8c56..0fdbc61b95 100644 --- a/exception_lists/cstyle +++ b/exception_lists/cstyle @@ -655,9 +655,39 @@ usr/src/uts/common/gssapi/mechs/krb5/mech/util_validate.c usr/src/uts/common/gssapi/mechs/krb5/mech/val_cred.c usr/src/uts/common/gssapi/mechs/krb5/mech/verify.c usr/src/uts/common/gssapi/mechs/krb5/mech/wrap_size_limit.c -usr/src/uts/common/io/igb/igb_api.c -usr/src/uts/common/io/igb/igb_nvm.c -usr/src/uts/common/io/igb/igb_defines.h +usr/src/uts/common/io/e1000api/e1000_80003es2lan.c +usr/src/uts/common/io/e1000api/e1000_80003es2lan.h +usr/src/uts/common/io/e1000api/e1000_82540.c +usr/src/uts/common/io/e1000api/e1000_82541.c +usr/src/uts/common/io/e1000api/e1000_82541.h +usr/src/uts/common/io/e1000api/e1000_82542.c +usr/src/uts/common/io/e1000api/e1000_82543.c +usr/src/uts/common/io/e1000api/e1000_82543.h +usr/src/uts/common/io/e1000api/e1000_82571.c +usr/src/uts/common/io/e1000api/e1000_82571.h +usr/src/uts/common/io/e1000api/e1000_82575.c +usr/src/uts/common/io/e1000api/e1000_82575.h +usr/src/uts/common/io/e1000api/e1000_api.c +usr/src/uts/common/io/e1000api/e1000_api.h +usr/src/uts/common/io/e1000api/e1000_defines.h +usr/src/uts/common/io/e1000api/e1000_hw.h +usr/src/uts/common/io/e1000api/e1000_i210.c +usr/src/uts/common/io/e1000api/e1000_i210.h +usr/src/uts/common/io/e1000api/e1000_ich8lan.c +usr/src/uts/common/io/e1000api/e1000_ich8lan.h +usr/src/uts/common/io/e1000api/e1000_mac.c +usr/src/uts/common/io/e1000api/e1000_mac.h +usr/src/uts/common/io/e1000api/e1000_manage.c +usr/src/uts/common/io/e1000api/e1000_manage.h +usr/src/uts/common/io/e1000api/e1000_mbx.c +usr/src/uts/common/io/e1000api/e1000_mbx.h +usr/src/uts/common/io/e1000api/e1000_nvm.c +usr/src/uts/common/io/e1000api/e1000_nvm.h +usr/src/uts/common/io/e1000api/e1000_phy.c +usr/src/uts/common/io/e1000api/e1000_phy.h +usr/src/uts/common/io/e1000api/e1000_regs.h +usr/src/uts/common/io/e1000api/e1000_vf.c +usr/src/uts/common/io/e1000api/e1000_vf.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 |