| commit | fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233 | [log] [tgz] |
|---|---|---|
| author | Jason Gunthorpe <jgg@nvidia.com> | Tue Jun 22 14:42:52 2021 -0300 |
| committer | Jason Gunthorpe <jgg@nvidia.com> | Tue Jun 22 14:43:51 2021 -0300 |
| tree | e21b6d503468282cd9010d24b35327dc8d772980 | |
| parent | 6d33cabf2baf304730d01a942095416b3a8329ab [diff] | |
| parent | 13311e74253fe64329390df80bed3f07314ddd61 [diff] |
Merge tag 'v5.13-rc7' into rdma.git for-next Linux 5.13-rc7 Needed for dependencies in following patches. Merge conflict in rxe_cmop.c resolved by compining both patches. Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>