public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-15 19:25:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/drivers/nvme/target
History
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
..
admin-cmd.c nvmet: add ns write protect support 2018-08-08 12:00:53 +02:00
configfs.c for-4.19/block-20180812 2018-08-14 10:23:25 -07:00
core.c for-4.19/block-20180812 2018-08-14 10:23:25 -07:00
discovery.c nvmet-rdma: support max(16KB, PAGE_SIZE) inline data 2018-07-23 09:35:16 +02:00
fabrics-cmd.c
fc.c nvmet-fc: fix target sgl list on large transfers 2018-07-24 13:44:09 +02:00
fcloop.c
io-cmd-bdev.c nvmet: add ns write protect support 2018-08-08 12:00:53 +02:00
io-cmd-file.c nvmet: add ns write protect support 2018-08-08 12:00:53 +02:00
Kconfig
loop.c for-4.19/block-20180812 2018-08-14 10:23:25 -07:00
Makefile
nvmet.h nvmet: add ns write protect support 2018-08-08 12:00:53 +02:00
rdma.c Merge branch 'linus/master' into rdma.git for-next 2018-08-16 14:21:29 -06:00