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

..

af_smc.c

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

2018-08-09 11:52:36 -07:00

Kconfig

net/smc: remove Kconfig warning

2017-07-29 11:22:58 -07:00

Makefile

net/smc: add base infrastructure for SMC-D and ISM

2018-06-30 20:42:25 +09:00

smc_cdc.c

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

2018-08-05 13:04:31 -07:00

smc_cdc.h

net/smc: eliminate cursor read and write calls

2018-07-23 10:57:14 -07:00

smc_clc.c

net/smc: provide fallback reason code

2018-07-25 22:25:53 -07:00

smc_clc.h

net/smc: provide fallback reason code

2018-07-25 22:25:53 -07:00

smc_close.c

net/smc: reduce sock_put() for fallback sockets

2018-07-07 20:25:13 +09:00

smc_close.h

net/smc: replace sock_put worker by socket refcounting

2018-01-26 10:41:56 -05:00

smc_core.c

Merge branch 'linus/master' into rdma.git for-next

2018-08-16 14:21:29 -06:00

smc_core.h

net/smc: improve delete link processing

2018-07-25 22:25:53 -07:00

smc_diag.c

net/smc: provide fallback reason code

2018-07-25 22:25:53 -07:00

smc_ib.c

Merge branch 'linus/master' into rdma.git for-next

2018-08-16 14:21:29 -06:00

smc_ib.h

net/smc: use correct vlan gid of RoCE device

2018-07-25 22:25:53 -07:00

smc_ism.c

net/smc: send response to test link signal

2018-08-10 14:38:43 -07:00

smc_ism.h

net/smc: add base infrastructure for SMC-D and ISM

2018-06-30 20:42:25 +09:00

smc_llc.c

net/smc: improve delete link processing

2018-07-25 22:25:53 -07:00

smc_llc.h

net/smc: improve delete link processing

2018-07-25 22:25:53 -07:00

smc_pnet.c

net/smc: use correct vlan gid of RoCE device

2018-07-25 22:25:53 -07:00

smc_pnet.h

net/smc: use correct vlan gid of RoCE device

2018-07-25 22:25:53 -07:00

smc_rx.c

net/smc: remove local variable page in smc_rx_splice()

2018-07-23 10:57:14 -07:00

smc_rx.h

smc: add support for splice()

2018-05-04 11:45:06 -04:00

smc_tx.c

Merge branch 'linus/master' into rdma.git for-next

2018-08-16 14:21:29 -06:00

smc_tx.h

net/smc: eliminate cursor read and write calls

2018-07-23 10:57:14 -07:00

smc_wr.c

Merge branch 'linus/master' into rdma.git for-next

2018-08-16 14:21:29 -06:00

smc_wr.h

net/smc: Simplify ib_post_(send|recv|srq_recv)() calls

2018-07-24 16:06:37 -06:00

smc.h

net/smc: provide fallback reason code

2018-07-25 22:25:53 -07:00