Re: linux-next: manual merge of the iommufd tree with the iommu tree

[Jason Gunthorpe]

On Wed, Oct 25, 2023 at 03:44:20PM +1100, Stephen Rothwell wrote:
> diff --cc include/linux/iommu.h
> index b5b254e205c6,f347bf31761f..000000000000
> --- a/include/linux/iommu.h
> +++ b/include/linux/iommu.h
> @@@ -64,8 -66,10 +66,11 @@@ struct iommu_domain_geometry 
>   #define __IOMMU_DOMAIN_DMA_FQ	(1U << 3)  /* DMA-API uses flush queue    */
>   
>   #define __IOMMU_DOMAIN_SVA	(1U << 4)  /* Shared process address space */
>  +#define __IOMMU_DOMAIN_PLATFORM	(1U << 5)
>   
> + #define __IOMMU_DOMAIN_NESTED	(1U << 5)  /* User-managed address space nested
> + 					      on a stage-2 translation        */

One of these should be 6

I'm going to change my tree so __IOMMU_DOMAIN_NESTED is 6

Otherwise looks OK thanks

Jason