diff options
author | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-12 18:49:56 +0300 |
---|---|---|
committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-13 22:59:51 +0300 |
commit | 75c66515e4fea4e9bb488b6125e014220f846c61 (patch) | |
tree | a7a79ca9a05da74fd3fd74b1c8c3e1cb2901c167 /drivers/infiniband/hw/bnxt_re/ib_verbs.c | |
parent | 1ba7c8f800586805c409f5b1ff1803318a41933a (diff) | |
parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
download | linux-75c66515e4fea4e9bb488b6125e014220f846c61.tar.xz |
Merge tag 'v5.3-rc8' into rdma.git for-next
To resolve dependencies in following patches
mlx5_ib.h conflict resolved by keeing both hunks
Linux 5.3-rc8
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/hw/bnxt_re/ib_verbs.c')
0 files changed, 0 insertions, 0 deletions