diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-02 10:55:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-02 10:55:32 -0700 |
| commit | 89b1698c93a9dee043154f33d96bca9964e705f1 (patch) | |
| tree | dd9dcb1965baae8edcf0b496aaa6a70609b6fc11 /net/rds/ib_mr.h | |
| parent | ffd7ce3cd9c294f1ff49ec02cdbd1bc7cb913db6 (diff) | |
| parent | e30cb13c5a09ff5f043a6570c32e49b063bea6a1 (diff) | |
| download | linux-89b1698c93a9dee043154f33d96bca9964e705f1.tar.bz2 | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.
The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/ib_mr.h')
| -rw-r--r-- | net/rds/ib_mr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rds/ib_mr.h b/net/rds/ib_mr.h index f440ace584c8..5da12c248431 100644 --- a/net/rds/ib_mr.h +++ b/net/rds/ib_mr.h @@ -117,7 +117,8 @@ void rds6_ib_get_mr_info(struct rds_ib_device *rds_ibdev, struct rds6_info_rdma_connection *iinfo6); void rds_ib_destroy_mr_pool(struct rds_ib_mr_pool *); void *rds_ib_get_mr(struct scatterlist *sg, unsigned long nents, - struct rds_sock *rs, u32 *key_ret); + struct rds_sock *rs, u32 *key_ret, + struct rds_connection *conn); void rds_ib_sync_mr(void *trans_private, int dir); void rds_ib_free_mr(void *trans_private, int invalidate); void rds_ib_flush_mrs(void); |