Jason Gunthorpe 0a3173a5f0 Merge branch 'linus/master' into rdma.git for-next
rdma.git merge resolution for the 4.19 merge window

Conflicts:
 drivers/infiniband/core/rdma_core.c
   - Use the rdma code and revise with the new spelling for
     atomic_fetch_add_unless
 drivers/nvme/host/rdma.c
   - Replace max_sge with max_send_sge in new blk code
 drivers/nvme/target/rdma.c
   - Use the blk code and revise to use NULL for ib_post_recv when
     appropriate
   - Replace max_sge with max_recv_sge in new blk code
 net/rds/ib_send.c
   - Use the net code and revise to use NULL for ib_post_recv when
     appropriate

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
2018-08-16 14:21:29 -06:00
..
2018-06-12 16:19:22 -07:00
2018-05-27 17:56:35 -05:00
2016-10-13 19:48:11 -05:00
2018-08-07 14:23:20 -05:00
2018-08-07 14:15:41 -05:00
2018-06-12 16:19:22 -07:00
2018-08-07 14:15:41 -05:00
2017-03-02 23:13:37 -06:00
2018-06-01 09:14:30 -05:00
2018-06-01 09:14:30 -05:00
2012-07-24 10:25:13 -05:00
2018-08-16 13:12:00 -06:00
2018-07-05 13:48:24 -05:00
2013-09-08 14:54:24 -05:00