Merge branch 'sg_nents' into rdma.git for-next

From Maor Gottlieb
====================

Fix the use of nents and orig_nents in the sg table append helpers. The
nents should be used by the DMA layer to store the number of DMA mapped
sges, the orig_nents is the number of CPU sges.

Since the sg append logic doesn't always create a SGL with exactly
orig_nents entries store a total_nents as well to allow the table to be
properly free'd and reorganize the freeing logic to share across all the
use cases.

====================

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
* 'sg_nents':
  RDMA: Use the sg_table directly and remove the opencoded version from umem
  lib/scatterlist: Fix wrong update of orig_nents
  lib/scatterlist: Provide a dedicated function to support table append

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/hw/bnxt_re/main.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_main.c
Simple merge

diff --cc drivers/infiniband/hw/irdma/verbs.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/cq.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/devx.c
Simple merge

diff --cc drivers/infiniband/hw/qedr/verbs.c
Simple merge

diff --cc drivers/infiniband/sw/rdmavt/mr.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_mr.c
index 1ee5bd8,b5fcb14..5890a82
--- 1/drivers/infiniband/sw/rxe/rxe_mr.c
--- 2/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@@ -116,12 -117,13 +117,12 @@@ int rxe_mr_init_user(struct rxe_pd *pd
  
        umem = ib_umem_get(pd->ibpd.device, start, length, access);
        if (IS_ERR(umem)) {
-               pr_warn("err %d from rxe_umem_get\n",
-                       (int)PTR_ERR(umem));
+               pr_warn("%s: Unable to pin memory region err = %d\n",
+                       __func__, (int)PTR_ERR(umem));
                err = PTR_ERR(umem);
-               goto err1;
+               goto err_out;
        }
  
 -      mr->umem = umem;
        num_buf = ib_umem_num_pages(umem);
  
        rxe_mr_init(access, mr);

diff --cc drivers/infiniband/sw/rxe/rxe_net.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_resp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/cq.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
Simple merge

diff --cc drivers/vdpa/mlx5/net/mlx5_vnet.c
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/rdma/ib_verbs.h
Simple merge