diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-12 11:49:56 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-13 15:59:51 -0400 |
| commit | 75c66515e4fea4e9bb488b6125e014220f846c61 (patch) | |
| tree | a7a79ca9a05da74fd3fd74b1c8c3e1cb2901c167 /include/rdma | |
| parent | 1ba7c8f800586805c409f5b1ff1803318a41933a (diff) | |
| parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
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 'include/rdma')
| -rw-r--r-- | include/rdma/restrack.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/rdma/restrack.h b/include/rdma/restrack.h index b0fc6b26bdf5..83df1ec6664e 100644 --- a/include/rdma/restrack.h +++ b/include/rdma/restrack.h | |||
| @@ -105,8 +105,7 @@ struct rdma_restrack_entry { | |||
| 105 | }; | 105 | }; |
| 106 | 106 | ||
| 107 | int rdma_restrack_count(struct ib_device *dev, | 107 | int rdma_restrack_count(struct ib_device *dev, |
| 108 | enum rdma_restrack_type type, | 108 | enum rdma_restrack_type type); |
| 109 | struct pid_namespace *ns); | ||
| 110 | 109 | ||
| 111 | void rdma_restrack_kadd(struct rdma_restrack_entry *res); | 110 | void rdma_restrack_kadd(struct rdma_restrack_entry *res); |
| 112 | void rdma_restrack_uadd(struct rdma_restrack_entry *res); | 111 | void rdma_restrack_uadd(struct rdma_restrack_entry *res); |