AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-25 05:57:50 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
91f84690b5
linux_dsm_epyc7002/drivers/nvme
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
..
host Merge branch 'linus/master' into rdma.git for-next 2018-08-16 14:21:29 -06:00
target Merge branch 'linus/master' into rdma.git for-next 2018-08-16 14:21:29 -06:00
Kconfig
Makefile