]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'master' into rdma-next
authorLeon Romanovsky <leon@kernel.org>
Mon, 30 Mar 2026 09:02:58 +0000 (05:02 -0400)
committerLeon Romanovsky <leon@kernel.org>
Mon, 30 Mar 2026 17:47:44 +0000 (13:47 -0400)
Let's bring v7.0-rc6 to the -next branch, so we can merge the DMA
attributes fix [1] without merge conflicts.

[1] https://lore.kernel.org/all/20260323-umem-dma-attrs-v1-1-d6890f2e6a1e@nvidia.com

Signed-off-by: Leon Romanovsky <leon@kernel.org>
* master: (1688 commits)
  Linux 7.0-rc6
  ...

1  2 
MAINTAINERS
drivers/infiniband/core/umem.c
drivers/infiniband/hw/irdma/verbs.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge