Hi Linus, Please pull from git://github.com/dledford/linux.git tags/for-linus Most of the changes are fairly small and well confined. The iWARP address reporting changes are the only ones that are a medium size. I had these queued up prior to rc1, but due to the shuffle in maintainers, they did not get submitted when I expected. My apologies for that. I feel comfortable with them however due to the testing they've received, so I left them in this submission. ---------------------------------------------------------------- Minor updates for 4.1-rc ---------------------------------------------------------------- Bart Van Assche (1): IPoIB/CM: Fix indentation level David Ahern (1): IB/core: Fix unaligned accesses Doug Ledford (1): MAINTAINERS: Update InfiniBand subsystem maintainer Guy Shapiro (2): IB/core: dma map/unmap locking optimizations IB/core: dma unmap optimizations Hariprasad S (5): iw_cxgb4: Cleanup register defines/MACROS iw_cxgb4: 32b platform fixes iw_cxgb4: use BAR2 GTS register for T5 kernel mode CQs iw_cxgb4: enforce qp/cq id requirements iw_cxgb4: Remove negative advice dmesg warnings Honggang LI (1): IB/core: change rdma_gid2ip into void function as it always return zero Jason Gunthorpe (1): RDMA/CMA: Canonize IPv4 on IPV6 sockets properly Luis R. Rodriguez (2): IB/qib: add acounting for MTRR IB/qib: use arch_phys_wc_add() Steve Wise (1): RDMA/cxgb4: Report the actual address of the remote connecting peer Tatyana Nikolova (2): RDMA/core: Enable the iWarp Port Mapper to provide the actual address of the connecting peer to its clients RDMA/nes: Report the actual address of the remote connecting peer Yann Droneaud (1): MAINTAINERS: add include/rdma/ to InfiniBand subsystem MAINTAINERS | 6 +- drivers/infiniband/core/addr.c | 13 +- drivers/infiniband/core/cm.c | 23 ++-- drivers/infiniband/core/cm_msgs.h | 4 +- drivers/infiniband/core/cma.c | 27 ++-- drivers/infiniband/core/iwpm_msg.c | 73 ++++++++++- drivers/infiniband/core/iwpm_util.c | 208 +++++++++++++++++++++++++----- drivers/infiniband/core/iwpm_util.h | 15 +++ drivers/infiniband/core/umem_odp.c | 14 +- drivers/infiniband/hw/cxgb4/cm.c | 87 ++++++++++--- drivers/infiniband/hw/cxgb4/cq.c | 22 ++-- drivers/infiniband/hw/cxgb4/device.c | 37 +++++- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 7 + drivers/infiniband/hw/cxgb4/mem.c | 6 +- drivers/infiniband/hw/cxgb4/qp.c | 10 +- drivers/infiniband/hw/cxgb4/t4.h | 7 +- drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 4 +- drivers/infiniband/hw/nes/nes.c | 1 + drivers/infiniband/hw/nes/nes_cm.c | 65 +++++++--- drivers/infiniband/hw/qib/qib.h | 1 - drivers/infiniband/hw/qib/qib_file_ops.c | 3 +- drivers/infiniband/hw/qib/qib_iba6120.c | 8 +- drivers/infiniband/hw/qib/qib_iba7220.c | 8 +- drivers/infiniband/hw/qib/qib_iba7322.c | 41 +++--- drivers/infiniband/hw/qib/qib_init.c | 26 +--- drivers/infiniband/hw/qib/qib_wc_x86_64.c | 31 +---- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- include/rdma/ib_addr.h | 3 +- include/rdma/ib_cm.h | 7 +- include/rdma/iw_portmap.h | 25 ++++ include/uapi/rdma/rdma_netlink.h | 1 + 31 files changed, 568 insertions(+), 219 deletions(-) -- Doug Ledford GPG KeyID: 0E572FDD