Messages in this thread |  | | Date | Mon, 10 Aug 2020 08:43:53 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the iommu tree with the dma-mapping tree |
| |
Hi all,
On Thu, 30 Jul 2020 15:20:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the iommu tree got a conflict in: > > drivers/iommu/Kconfig > > between commit: > > 2f9237d4f6df ("dma-mapping: make support for dma ops optional") > > from the dma-mapping tree and commit: > > ab65ba57e3ac ("iommu/vt-d: Move Kconfig and Makefile bits down into intel directory") > > from the iommu tree. > > I fixed it up (I used the ;atter and applied the folowing merge fix > patch as well) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Thu, 30 Jul 2020 15:14:18 +1000 > Subject: [PATCH] merge fix for "dma-mapping: make support for dma ops optional" > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/iommu/intel/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/iommu/intel/Kconfig b/drivers/iommu/intel/Kconfig > index 877beec9d987..5337ee1584b0 100644 > --- a/drivers/iommu/intel/Kconfig > +++ b/drivers/iommu/intel/Kconfig > @@ -6,6 +6,7 @@ config DMAR_TABLE > config INTEL_IOMMU > bool "Support for Intel IOMMU using DMA Remapping Devices" > depends on PCI_MSI && ACPI && (X86 || IA64) > + select DMA_OPS > select IOMMU_API > select IOMMU_IOVA > select NEED_DMA_MAP_STATE > -- > 2.27.0
This is now a conflict between the iommu tree and Linus' tree.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] |  |