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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 4 Nov 2022 15:24:34 +1100

Hi all,

Today's linux-next merge of the iommufd tree got conflicts in:

  drivers/iommu/iommu.c
  include/linux/iommu.h

between commits from the iommu and iommufd trees.

I don't have time to disentangle this, so I have just dropped the iommufd
tree for today.  Please coordinate.

-- 
Cheers,
Stephen Rothwell