Skip to content

Commit

Permalink
Merge branch 'mlx5_ifc-updates'
Browse files Browse the repository at this point in the history
Saeed Mahameed says:

====================
mlx5_core: mlx5_ifc updates

This series include mlx5_core updates for both net-next and rdma
trees for 4.7 kernel cycle. This is the only shared code planned
for 4.7 between rdma and net trees. Hopefully, this will prevent
future conflicts when merging between ib-next and net-next once
4.7 cycle is over and merge window is opened.

Both Mellanox rdma and net submissions will proceed once this series
is applied into both trees.

Future shared code will be sent to both maintainers as pull requests
from Mellanox's kernel.org tree.

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

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Apr 15, 2016
2 parents 993feee + 7d5e142 commit 936d4b4
Showing 1 changed file with 179 additions and 74 deletions.
Loading

0 comments on commit 936d4b4

Please sign in to comment.