Jason Gunthorpe 59bfc59a68 Merge branch 'for-rc' into rdma.git for-next ...

From git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

This is required to resolve dependencies of the next series of RDMA
patches.

The code motion conflicts in drivers/infiniband/core/cache.c were
resolved.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

2018-10-16 00:01:02 -06:00

38 KiB

Raw Blame History

View Raw