| commit | 4dd42b94b4d25c0f99ee9ba0748dd315653b6a34 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Apr 24 13:54:48 2017 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Mon Apr 24 13:54:48 2017 -0400 |
| tree | f5d644d7f6abf91ba2756adce4a533d38040bb9a | |
| parent | 120645513f55a4ac5543120d9e79925d30a0156f [diff] | |
| parent | 9e54e322ded40f424dcb5a13508e2556919ce12a [diff] |
Merge branch 'bnxt_en-misc-next' Michael Chan says: ==================== bnxt_en: Updates for net-next. Miscellaneous updates include passing DCBX RoCE VLAN priority to firmware, checking one more new firmware flag before allowing DCBX to run on the host, adding 100Gbps speed support, adding check to disallow speed settings on Multi-host NICs, and a minor fix for reporting VF attributes. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>