git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Jason Gunthorpe <jgg@mellanox.com>
	Thu, 16 Aug 2018 20:13:03 +0000 (14:13 -0600)
committer	Jason Gunthorpe <jgg@mellanox.com>
	Thu, 16 Aug 2018 20:21:29 +0000 (14:21 -0600)
commit	0a3173a5f09bc58a3638ecfd0a80bdbae55e123c
tree	d6c0bc84863cca54dfbde3b7463e5d49c82af9f1	tree \| snapshot
parent	92f4e77c85918eab5e5803d7e28ab89a7e6bd3a2	commit \| diff
parent	5c60a7389d795e001c8748b458eb76e3a5b6008c	commit \| diff

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>

23 files changed:

.mailmap	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/rdma_core.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/vnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/hns_roce_hw_v1.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/iser/iser_memory.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/srpt/ib_srpt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/rdma.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
net/rds/ib.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_frmr.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_recv.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_send.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_ib.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_tx.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_wr.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

.mailmap	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/rdma_core.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/vnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/hns_roce_hw_v1.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/iser/iser_memory.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/srpt/ib_srpt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/rdma.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
net/rds/ib.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_frmr.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_recv.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_send.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_ib.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_tx.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_wr.c	diff1 \|	diff2 \|	blob \| history