![]() Conflicts: drivers/infiniband/hw/mlx4/main.c drivers/net/ethernet/mellanox/mlx4/main.c include/linux/mlx4/device.h |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ah.c | ||
cq.c | ||
doorbell.c | ||
mad.c | ||
main.c | ||
mlx4_ib.h | ||
mr.c | ||
qp.c | ||
srq.c | ||
user.h |
![]() Conflicts: drivers/infiniband/hw/mlx4/main.c drivers/net/ethernet/mellanox/mlx4/main.c include/linux/mlx4/device.h |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ah.c | ||
cq.c | ||
doorbell.c | ||
mad.c | ||
main.c | ||
mlx4_ib.h | ||
mr.c | ||
qp.c | ||
srq.c | ||
user.h |