tree 3225c2a7a5c9ddc64991be14c94a06e63a34794a
parent 36f6fdb74997c3f456f1c6a9803c009c49a30053
parent aa9a2d51a3e70b15a898bec7dde3ce5726fec641
author David S. Miller <davem@davemloft.net> 1394654246 -0400
committer David S. Miller <davem@davemloft.net> 1394654246 -0400

Merge branch 'mlx4-next'

Or Gerlitz says:

====================
mlx4: Add SRIOV support for RoCE

This series adds SRIOV support for RoCE (RDMA over Ethernet) to the mlx4 driver.

The patches are against net-next, as of commit 2d8d40a "pkt_sched: fq:
do not hold qdisc lock while allocating memory"

changes from V1:
 - addressed feedback from Dave on patch #3 and changed get_real_sgid_index()
   to be called fill_in_real_sgid_index() and be a void  function.
 - removed some checkpatch warnings on long lines

changes from V0:
  - always check the return code of mlx4_get_roce_gid_from_slave().
    The call we fixed is introduced in patch #1 and later removed by
    patch #3 that allows guests to have multiple GIDS. The 1..3
    separation was done for proper division of patches to logical changes.
====================

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