Merge tag 'v6.1-rc7' into iommufd.git for-next (90337f52) · Commits · github.com / kvm-riscv / linux

Commit 90337f52 authored Nov 29, 2022 by

Jason Gunthorpe

Merge tag 'v6.1-rc7' into iommufd.git for-next



Resolve conflicts in drivers/vfio/vfio_main.c by using the iommfd version.
The rc fix was done a different way when iommufd patches reworked this
code.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

parents 169dd5c9 b7b275e6

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment