]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ip-roce' into for-next
authorRoland Dreier <roland@purestorage.com>
Thu, 23 Jan 2014 07:24:21 +0000 (23:24 -0800)
committerRoland Dreier <roland@purestorage.com>
Thu, 23 Jan 2014 07:24:21 +0000 (23:24 -0800)
commitc825482d355f54853e63b611578c0f13af32c877
tree93d02ff7f0f530286fd54d03b632c6eaabc9dcc9
parentfcf8d3559140b24c0db8489b8b6019de9feb7885
parentea213d42cc733176b5dafb608d7fc093be011042
Merge branch 'ip-roce' into for-next

Conflicts:
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/Kconfig
drivers/infiniband/core/cma.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx4/mlx4_ib.h
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/mlx5/qp.c
drivers/infiniband/hw/ocrdma/ocrdma_ah.c
include/linux/mlx4/device.h
include/rdma/ib_verbs.h