linux-next: manual merge of the iommufd tree with the iommu tree
From: Stephen Rothwell
Date: Fri Nov 04 2022 - 00:26:02 EST
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
Attachment:
pgpXeVCWarA6Y.pgp
Description: OpenPGP digital signature