mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
89982f7cce
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAltwm2geHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGITkH/iSzkVhT2OxHoir0
mLVzTi7/Z17L0e/ELl7TvAC0iLFlWZKdlGR0g3b4/QpXLPmNK4HxiDRTQuWn8ke0
qDZyDq89HqLt+mpeFZ43PCd9oqV8CH2xxK3iCWReqv6bNnowGnRpSStlks4rDqWn
zURC/5sUh7TzEG4s997RrrpnyPeQWUlf/Mhtzg2/WvK2btoLWgu5qzjX1uFh3s7u
vaF2NXVJ3X03gPktyxZzwtO1SwLFS1jhwUXWBZ5AnoJ99ywkghQnkqS/2YpekNTm
wFk80/78sU+d91aAqO8kkhHj8VRrd+9SGnZ4mB2aZHwjZjGcics4RRtxukSfOQ+6
L47IdXo=
=sJkt
-----END PGP SIGNATURE-----
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>
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| rxe_av.c | ||
| rxe_comp.c | ||
| rxe_cq.c | ||
| rxe_hdr.h | ||
| rxe_hw_counters.c | ||
| rxe_hw_counters.h | ||
| rxe_icrc.c | ||
| rxe_loc.h | ||
| rxe_mcast.c | ||
| rxe_mmap.c | ||
| rxe_mr.c | ||
| rxe_net.c | ||
| rxe_net.h | ||
| rxe_opcode.c | ||
| rxe_opcode.h | ||
| rxe_param.h | ||
| rxe_pool.c | ||
| rxe_pool.h | ||
| rxe_qp.c | ||
| rxe_queue.c | ||
| rxe_queue.h | ||
| rxe_recv.c | ||
| rxe_req.c | ||
| rxe_resp.c | ||
| rxe_srq.c | ||
| rxe_sysfs.c | ||
| rxe_task.c | ||
| rxe_task.h | ||
| rxe_verbs.c | ||
| rxe_verbs.h | ||
| rxe.c | ||
| rxe.h | ||