David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ...

Lots of overlapping changes, mostly trivial in nature.

The mlxsw conflict was resolving using the example
resolution at:

https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c

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

2018-08-05 13:04:31 -07:00

..

core

RDMA/uverbs: Expand primary and alt AV port checks

2018-07-24 15:30:34 -06:00

hw

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

2018-07-23 14:58:46 -07:00

sw

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

2018-06-21 07:22:30 +09:00

ulp

net: allow ndo_select_queue to pass netdev

2018-07-09 13:41:34 -07:00

Kconfig

RDMA/ucm: Mark UCM interface as BROKEN

2018-05-24 09:39:25 -06:00

Makefile

…