]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'cxgb4-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 2 Jun 2015 05:14:35 +0000 (22:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Jun 2015 05:14:35 +0000 (22:14 -0700)
commitce0a6b6ded6ed2c0a79bfed1e6275f879b4f7485
tree119132fcc78cc27155b4954d7bc9a55fee046838
parent688255ec41a20df5cb08405947cfd97fc76234d4
parentd8378399067a4f3cb3867d3056a1a9c32c5fde95
Merge branch 'cxgb4-next'

Hariprasad Shenai says:

====================
cxgb4/cxgb4vf: Adds support for Chelsio T6 adapter

This patch series adds the following:
Adds NIC driver support for T6 adapter
Adds vNIC driver support for T6 adapter

This patch series has been created against net-next tree and includes
patches on cxgb4 and cxgb4vf driver.

We have included all the maintainers of respective drivers. Kindly review
the change and let us know in case of any review comments.

Thanks

V2:
 Fixed compilation issue, when CHELSIO_T4_FCOE is set
====================

Signed-off-by: David S. Miller <davem@davemloft.net>