Jason Gunthorpe 89982f7cce Linux 4.18 ... -----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>		2018-08-16 13:12:00 -06:00
..
client.c	net/9p/client.c: put refcount of trans_mod in error case in parse_opts()	2018-07-14 11:11:09 -07:00
error.c
Kconfig	IB: Revert "remove redundant INFINIBAND kconfig dependencies"	2018-05-28 10:40:16 -06:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mod.c	net/9p: correct the variable name in v9fs_get_trans_by_name() comment	2018-05-07 23:38:15 -04:00
protocol.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
protocol.h
trans_common.c	net/9p: correct some comment errors in 9p file system code	2018-05-10 08:21:53 -04:00
trans_common.h
trans_fd.c	Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2018-06-04 13:57:43 -07:00
trans_rdma.c	net/9p: Simplify ib_post_(send|recv|srq_recv)() calls	2018-07-24 16:06:36 -06:00
trans_virtio.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
trans_xen.c	net/9p/trans_xen.c: don't inclide rwlock.h directly	2018-06-07 17:34:34 -07:00
util.c