| commit | 59bfc59a68286c5e6824ec3dddcf5232a73c217e | [log] [tgz] |
|---|---|---|
| author | Jason Gunthorpe <jgg@mellanox.com> | Tue Oct 16 00:01:02 2018 -0600 |
| committer | Jason Gunthorpe <jgg@mellanox.com> | Tue Oct 16 00:01:02 2018 -0600 |
| tree | ccb6b22ba5238ab7abc691ccfccf52ced7e11aea | |
| parent | ed7a01fd3fd77f40b4ef2562b966a5decd8928d2 [diff] | |
| parent | dd9a403495704fc80fb9f399003013ef2be2ee23 [diff] |
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>