projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1ceeca 94710ca)
Merge tag 'v4.18' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Thu, 16 Aug 2018 19:08:18 +0000 (13:08 -0600)
committerJason Gunthorpe <jgg@mellanox.com>
Thu, 16 Aug 2018 19:12:00 +0000 (13:12 -0600)
commit89982f7ccee2fcd8fea7936b81eec6defbf0f131
treefc553c8d008d24595ad7de0ea0f3b56f656da27ctree | snapshot
parenta1ceeca679dccc492235f0f629d9e9f7b3d51ca8commit | diff
parent94710cac0ef4ee177a63b5227664b38c95bbf703commit | diff
Merge tag 'v4.18' into rdma.git for-next

Resolve merge conflicts from the -rc cycle against the rdma.git tree:

Conflicts:
 drivers/infiniband/core/uverbs_cmd.c
  - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next
  - Merge removal of file->ucontext in for-next with new code in -rc
 drivers/infiniband/core/uverbs_main.c
  - for-next removed code from ib_uverbs_write() that was modified
    in for-rc

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
18 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/infiniband/core/uverbs_cmd.c diff1 | diff2 | blob | history
drivers/infiniband/core/verbs.c diff1 | diff2 | blob | history
drivers/infiniband/hw/hfi1/rc.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/main.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/srq.c diff1 | diff2 | blob | history
drivers/infiniband/hw/qedr/verbs.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/cmd.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c diff1 | diff2 | blob | history
drivers/nvme/host/rdma.c diff1 | diff2 | blob | history
fs/cifs/smbdirect.c diff1 | diff2 | blob | history
include/linux/mlx5/driver.h diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
include/rdma/ib_verbs.h diff1 | diff2 | blob | history
net/rds/ib_frmr.c diff1 | diff2 | blob | history
net/smc/smc_tx.c diff1 | diff2 | blob | history
John Crispins staging tree