From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joerg Roedel <joro@8bytes•org>
Cc: Christoph Hellwig <hch@lst•de>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jerry Snitselaar <jsnitsel@redhat•com>
Subject: Re: linux-next: manual merge of the iommu tree with the dma-mapping tree
Date: Mon, 10 Aug 2020 08:43:53 +1000 [thread overview]
Message-ID: <20200810084353.7833a05c@canb.auug.org.au> (raw)
In-Reply-To: <20200730152006.7d012668@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1809 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-08-09 22:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 5:20 linux-next: manual merge of the iommu tree with the dma-mapping tree Stephen Rothwell
2020-08-09 22:43 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-02 3:46 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200810084353.7833a05c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=joro@8bytes$(echo .)org \
--cc=jsnitsel@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox