Merge branch 'qedr' into k.o/for-next

Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/qedr/main.c
Simple merge

diff --cc drivers/infiniband/hw/qedr/qedr.h
index b2bb42e,06cb96d..bcfa1f9
--- 1/drivers/infiniband/hw/qedr/qedr.h
--- 2/drivers/infiniband/hw/qedr/qedr.h
+++ b/drivers/infiniband/hw/qedr/qedr.h
@@@ -41,8 -42,11 +42,10 @@@
  #include <linux/qed/roce_common.h>
  #include "qedr_hsi_rdma.h"
  
 -#define QEDR_MODULE_VERSION   "8.10.10.0"
  #define QEDR_NODE_DESC "QLogic 579xx RoCE HCA"
  #define DP_NAME(dev) ((dev)->ibdev.name)
+ #define IS_IWARP(_dev) ((_dev)->rdma_type == QED_RDMA_TYPE_IWARP)
+ #define IS_ROCE(_dev) ((_dev)->rdma_type == QED_RDMA_TYPE_ROCE)
  
  #define DP_DEBUG(dev, module, fmt, ...)                                       \
        pr_debug("(%s) " module ": " fmt,                               \
@@@ -160,10 -165,13 +164,15 @@@ struct qedr_dev 
        struct qedr_cq          *gsi_sqcq;
        struct qedr_cq          *gsi_rqcq;
        struct qedr_qp          *gsi_qp;
+       enum qed_rdma_type      rdma_type;
+       spinlock_t              idr_lock; /* Protect qpidr data-structure */
+       struct idr              qpidr;
+       struct workqueue_struct *iwarp_wq;
+       u16                     iwarp_max_mtu;
  
        unsigned long enet_state;
 +
 +      u8 user_dpm_enabled;
  };
  
  #define QEDR_MAX_SQ_PBL                       (0x8000)

diff --cc drivers/infiniband/hw/qedr/verbs.c
Simple merge