Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k...

diff --cc drivers/infiniband/core/agent.c
Simple merge

diff --cc drivers/infiniband/core/cache.c
Simple merge

diff --cc drivers/infiniband/core/cm.c
Simple merge

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/device.c
Simple merge

diff --cc drivers/infiniband/core/mad.c
Simple merge

diff --cc drivers/infiniband/core/mad_priv.h
Simple merge

diff --cc drivers/infiniband/core/multicast.c
Simple merge

diff --cc drivers/infiniband/core/sa_query.c
Simple merge

diff --cc drivers/infiniband/core/smi.c
Simple merge

diff --cc drivers/infiniband/core/sysfs.c
Simple merge

diff --cc drivers/infiniband/core/ucm.c
Simple merge

diff --cc drivers/infiniband/core/ucma.c
Simple merge

diff --cc drivers/infiniband/core/user_mad.c
Simple merge

diff --cc drivers/infiniband/core/verbs.c
Simple merge

diff --cc drivers/infiniband/hw/amso1100/c2_provider.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb3/iwch_provider.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/provider.c
Simple merge

diff --cc drivers/infiniband/hw/ehca/ehca_iverbs.h
Simple merge

diff --cc drivers/infiniband/hw/ehca/ehca_main.c
Simple merge

diff --cc drivers/infiniband/hw/ipath/ipath_verbs.c
Simple merge

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

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

diff --cc drivers/infiniband/hw/mthca/mthca_provider.c
Simple merge

diff --cc drivers/infiniband/hw/nes/nes_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_main.c
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/usnic/usnic_ib_main.c
Simple merge

diff --cc drivers/infiniband/hw/usnic/usnic_ib_verbs.h
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/infiniband/ulp/srp/ib_srp.c
Simple merge

diff --cc drivers/infiniband/ulp/srp/ib_srp.h
Simple merge

diff --cc drivers/scsi/ibmvscsi/ibmvscsi.c
Simple merge

diff --cc drivers/scsi/scsi_transport_srp.c
Simple merge

diff --cc include/rdma/ib_mad.h
Simple merge

diff --cc include/rdma/ib_verbs.h
Simple merge

diff --cc include/scsi/srp.h
Simple merge

diff --cc net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
Simple merge

diff --cc net/sunrpc/xprtrdma/svc_rdma_transport.c
Simple merge