linux-next: manual merge of the infiniband tree with the net-next tree

Hi all, Today's linux-next merge of the infiniband tree got a conflict in include/linux/mlx4/device.h between commit 2599d8580f93 ("net/mlx4_core: Use low memory profile on kdump kernel") from the net-next tree and commit e630664c8383 ("mlx4_core: Add helper functions to support MR re-registration

linux-next: manual merge of the infiniband tree with the net-next tree

Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/infiniband/hw/cxgb4/device.c between commit 7730b4c7e32c ("cxgb4/iw_cxgb4: work request logging feature") from the net-next tree and commit 6b54d54dea82 ("RDMA/cxgb4: Initialize the device status page") from the infi

linux-next: manual merge of the infiniband tree with the net-next tree

Hi all, Today's linux-next merge of the infiniband tree got a conflict in drivers/net/ethernet/mellanox/mlx4/cmd.c between commit 1a91de28831a ("mellanox: Logging message cleanups") from the net-next tree and commit 97982f5a91e9 ("IB/mlx4: Preparation for VFs to issue/receive SMI (QP0) requests/re

linux-next: manual merge of the infiniband tree with the net-next tree

Hi all, Today's linux-next merge of the infiniband tree got a conflict in include/linux/mlx4/device.h between commit 7ffdf726cfe0 ("net/mlx4_core: Add basic support for TCP/IP offloads under tunneling") from the net-next tree and commits 4de658036086 ("mlx4_core: Add support for steerable IB UD QP