Merge branch 'master' into rdma-next

Browse source

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
  ...

...

This commit is contained in:

Leon Romanovsky 2026-03-30 05:02:58 -04:00

parent adc09d7fbb 7aaa8047ea

commit e6fd249178

1625 changed files with 21713 additions and 10301 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/uapi/linux/dma-buf.h

View file

3

include/uapi/linux/io_uring.h

View file

8

include/uapi/linux/kvm.h

View file

4

include/uapi/linux/netfilter/nf_conntrack_common.h

View file