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

From: Stephen Rothwell
Date: Fri Nov 04 2022 - 00:26:02 EST

Next message: Hugh Dickins: "Re: [PATCH 1/3] mm,hugetlb: use folio fields in second tail page"
Previous message: Vineet Gupta: "Re: [PATCH v12 05/17] riscv: Add has_vector/riscv_vsize to save vector features."
Next in thread: Jason Gunthorpe: "Re: linux-next: manual merge of the iommufd tree with the iommu tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

Next message: Hugh Dickins: "Re: [PATCH 1/3] mm,hugetlb: use folio fields in second tail page"
Previous message: Vineet Gupta: "Re: [PATCH v12 05/17] riscv: Add has_vector/riscv_vsize to save vector features."
Next in thread: Jason Gunthorpe: "Re: linux-next: manual merge of the iommufd tree with the iommu tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]