]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge tag 'v6.15' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Mon, 26 May 2025 18:32:29 +0000 (15:32 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Mon, 26 May 2025 18:33:52 +0000 (15:33 -0300)
commitef2233850edc4cc0d5fc6136fcdb004a1ddfa7db
tree8ccfb0731d7ddf7d384c37b56ee15a22db025c0a
parent260ce16e579d375ba8f1ac945308343522f98d50
parent0ff41df1cb268fc69e703a08a57ee14ae967d0ca
Merge tag 'v6.15' into rdma.git for-next

Following patches need the RDMA rc branch since we are past the RC cycle
now.

Merge conflicts resolved based on Linux-next:

- For RXE odp changes keep for-next version and fixup new places that
  need to call is_odp_mr()
  https://lore.kernel.org/r/20250422143019.500201bd@canb.auug.org.au
  https://lore.kernel.org/r/20250514122455.3593b083@canb.auug.org.au

- irdma is keeping the while/kfree bugfix from -rc and the pf/cdev_info
  change from for-next
  https://lore.kernel.org/r/20250513130630.280ee6c5@canb.auug.org.au

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
14 files changed:
MAINTAINERS
drivers/infiniband/core/cma.c
drivers/infiniband/hw/hns/hns_roce_main.c
drivers/infiniband/hw/irdma/main.c
drivers/infiniband/hw/mlx5/fs.c
drivers/infiniband/sw/rxe/rxe_loc.h
drivers/infiniband/sw/rxe/rxe_mr.c
drivers/infiniband/sw/rxe/rxe_resp.c
drivers/iommu/dma-iommu.c
drivers/iommu/iommu.c
include/linux/dma-mapping.h
include/linux/iommu.h
include/rdma/ib_verbs.h
kernel/dma/mapping.c