Messages in this thread | | | Date | Mon, 30 Jan 2023 09:49:16 +0100 | From | Joerg Roedel <> | Subject | Re: linux-next: manual merge of the iommu tree with Linus' tree |
| |
Thanks for the report, Stephen.
Alex,
On Fri, Jan 27, 2023 at 02:13:30PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the iommu tree got a conflict in: > > drivers/vfio/vfio_iommu_type1.c > > between commit: > > 895c0747f726 ("vfio/type1: Respect IOMMU reserved regions in vfio_test_domain_fgsp()") > > from Linus' tree and commit: > > 1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()") > > from the iommu tree.
In case you want to fix this up in your tree, the patch-set causing this is in a separate branch in the IOMMU tree which you can merge into your tree:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu-memory-accounting
Regards,
-- Jörg Rödel jroedel@suse.de
SUSE Software Solutions Germany GmbH Frankenstraße 146 90461 Nürnberg Germany
(HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
| |