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/qib | |
| parent | c40238e3b8c98993e3c70057f6099e24cc2380f7 (diff) | |
| parent | df0cc57e057f18e44dac8e6c18aba47ab53202f9 (diff) | |
| download | linux-c0fe82baaeb2719f910359684c0817057f79a84a.tar.gz linux-c0fe82baaeb2719f910359684c0817057f79a84a.tar.bz2 linux-c0fe82baaeb2719f910359684c0817057f79a84a.zip | |
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/qib')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_user_sdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband/hw/qib/qib_user_sdma.c index ac11943a5ddb..bf2f30d67949 100644 --- a/drivers/infiniband/hw/qib/qib_user_sdma.c +++ b/drivers/infiniband/hw/qib/qib_user_sdma.c @@ -941,7 +941,7 @@ static int qib_user_sdma_queue_pkts(const struct qib_devdata *dd, &addrlimit) || addrlimit > type_max(typeof(pkt->addrlimit))) { ret = -EINVAL; - goto free_pbc; + goto free_pkt; } pkt->addrlimit = addrlimit; |