Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/core: Use kmemdup() instead of kmalloc()+memcpy() IB/iser: Fix error flow in iser_create_ib_conn_res() IB/iser: Enhance disconnection logic for multi-pathing IB/iser: Remove buggy back-pointer setting IB/iser: Add asynchronous event handler MAINTAINERS: Add cxgb4 and iw_cxgb4 entries RDMA/cxgb3: Shrink .text with compile-time init of handlers arrays IPoIB: Allow disabling/enabling TSO on the fly through ethtool IB/mlx4: Add support for masked atomic operations IB/core: Add support for masked atomic operations RDMA/cma: Randomize local port allocation RDMA/nes: Make unnecessarily global functions static RDMA/nes: Make nesadapter->phy_lock usage consistent RDMA/cxgb4: Add driver for Chelsio T4 RNIC IB/mthca: Use the dma state API instead of pci equivalents RDMA/amso1100: Use the dma state API instead of pci equivalents RDMA/cxgb3: Don't free skbs on NET_XMIT_* indications from LLD RDMA/cxgb3: Use the dma state API instead of pci equivalents IB: Explicitly rule out llseek to avoid BKL in default_llseek()
No related branches found
No related tags found
Showing
- MAINTAINERS 14 additions, 0 deletionsMAINTAINERS
- drivers/infiniband/Kconfig 1 addition, 0 deletionsdrivers/infiniband/Kconfig
- drivers/infiniband/Makefile 1 addition, 0 deletionsdrivers/infiniband/Makefile
- drivers/infiniband/core/cma.c 27 additions, 47 deletionsdrivers/infiniband/core/cma.c
- drivers/infiniband/core/mad.c 1 addition, 3 deletionsdrivers/infiniband/core/mad.c
- drivers/infiniband/core/ucm.c 2 additions, 1 deletiondrivers/infiniband/core/ucm.c
- drivers/infiniband/core/ucma.c 3 additions, 1 deletiondrivers/infiniband/core/ucma.c
- drivers/infiniband/core/user_mad.c 8 additions, 4 deletionsdrivers/infiniband/core/user_mad.c
- drivers/infiniband/core/uverbs_main.c 7 additions, 4 deletionsdrivers/infiniband/core/uverbs_main.c
- drivers/infiniband/hw/amso1100/c2.h 1 addition, 1 deletiondrivers/infiniband/hw/amso1100/c2.h
- drivers/infiniband/hw/amso1100/c2_alloc.c 2 additions, 2 deletionsdrivers/infiniband/hw/amso1100/c2_alloc.c
- drivers/infiniband/hw/amso1100/c2_cq.c 2 additions, 2 deletionsdrivers/infiniband/hw/amso1100/c2_cq.c
- drivers/infiniband/hw/amso1100/c2_mq.h 1 addition, 1 deletiondrivers/infiniband/hw/amso1100/c2_mq.h
- drivers/infiniband/hw/amso1100/c2_provider.h 1 addition, 1 deletiondrivers/infiniband/hw/amso1100/c2_provider.h
- drivers/infiniband/hw/amso1100/c2_rnic.c 6 additions, 6 deletionsdrivers/infiniband/hw/amso1100/c2_rnic.c
- drivers/infiniband/hw/cxgb3/cxio_hal.c 6 additions, 6 deletionsdrivers/infiniband/hw/cxgb3/cxio_hal.c
- drivers/infiniband/hw/cxgb3/cxio_hal.h 1 addition, 1 deletiondrivers/infiniband/hw/cxgb3/cxio_hal.h
- drivers/infiniband/hw/cxgb3/cxio_wr.h 2 additions, 2 deletionsdrivers/infiniband/hw/cxgb3/cxio_wr.h
- drivers/infiniband/hw/cxgb3/iwch.c 0 additions, 2 deletionsdrivers/infiniband/hw/cxgb3/iwch.c
- drivers/infiniband/hw/cxgb3/iwch_cm.c 67 additions, 66 deletionsdrivers/infiniband/hw/cxgb3/iwch_cm.c
Loading
Please register or sign in to comment