diff options
author | Jason Gunthorpe <jgg@nvidia.com> | 2022-01-13 13:21:03 -0400 |
---|---|---|
committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-01-13 13:21:03 -0400 |
commit | c0fe82baaeb2719f910359684c0817057f79a84a (patch) | |
tree | 74d879664c964efbf64ee51b5aa5a582fa868635 /drivers/infiniband/hw/mlx5/mlx5_ib.h | |
parent | c40238e3b8c98993e3c70057f6099e24cc2380f7 (diff) | |
parent | df0cc57e057f18e44dac8e6c18aba47ab53202f9 (diff) |
Merge tag 'v5.16' into rdma.git for-next
To resolve minor conflict in:
drivers/infiniband/hw/mlx5/mlx5_ib.h
By merging both hunks.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/mlx5_ib.h')
-rw-r--r-- | drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index 35d27f455eb9..cbc20e400be0 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -666,6 +666,7 @@ struct mlx5_ib_mr { /* User MR data */ struct mlx5_cache_ent *cache_ent; /* Everything after cache_ent is zero'd when MR allocated */ + struct ib_umem *umem; union { /* Used only while the MR is in the cache */ @@ -676,7 +677,7 @@ struct mlx5_ib_mr { struct list_head list; }; - /* Used only by kernel MRs */ + /* Used only by kernel MRs (umem == NULL) */ struct { void *descs; void *descs_alloc; @@ -697,9 +698,8 @@ struct mlx5_ib_mr { int data_length; }; - /* Used only by User MRs */ + /* Used only by User MRs (umem != NULL) */ struct { - struct ib_umem *umem; unsigned int page_shift; /* Current access_flags */ int access_flags; |