> Today's linux-next merge of the net tree got a conflict in:
> drivers/net/ethernet/qlogic/Kconfig
> between commit:
> 2e0cbc4dd077 ("qedr: Add RoCE driver framework")
> from Linus' tree and commit:
> 0189efb8f4f8 ("qed*: Fix Kconfig dependencies with INFINIBAND_QEDR")
> from the net tree.
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.
My bad; I've sent the fix to 'net' and was not aware that the
qedr submission was already accepted in linux-rdma.
> I also added this merge fix patch:
> From: Stephen Rothwell <s...@canb.auug.org.au>
> Date: Sun, 16 Oct 2016 08:09:42 +1100
> Subject: [PATCH] qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move
> Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
> ---
> drivers/infiniband/hw/qedr/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
> diff --git a/drivers/infiniband/hw/qedr/Kconfig
> b/drivers/infiniband/hw/qedr/Kconfig
> index 7c06d85568d4..6c9f3923e838 100644
> --- a/drivers/infiniband/hw/qedr/Kconfig
> +++ b/drivers/infiniband/hw/qedr/Kconfig
> @@ -2,6 +2,7 @@ config INFINIBAND_QEDR
> tristate "QLogic RoCE driver"
> depends on 64BIT && QEDE
> select QED_LL2
> + select QED_RDMA
> ---help---
> This driver provides low-level InfiniBand over Ethernet
> support for QLogic QED host channel adapters (HCAs).
> --
> 2.8.1
Looks good; Thanks.
