From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joerg Roedel <joro@8bytes•org>, Christoph Hellwig <hch@lst•de>
Cc: Joerg Roedel <jroedel@suse•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mario Limonciello <mario.limonciello@amd•com>
Subject: linux-next: manual merge of the iommu tree with the dma-mapping tree
Date: Mon, 2 May 2022 13:46:24 +1000 [thread overview]
Message-ID: <20220502134624.76a88cff@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 767 bytes --]
Hi all,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/iommu/amd/iommu.c
between commit:
78013eaadf69 ("x86: remove the IOMMU table infrastructure")
from the dma-mapping tree and commit:
121660bba631 ("iommu/amd: Enable swiotlb in all cases")
from the iommu tree.
I fixed it up (the latter removed the code modified by the former) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-02 3:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 3:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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
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=20220502134624.76a88cff@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=joro@8bytes$(echo .)org \
--cc=jroedel@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mario.limonciello@amd$(echo .)com \
/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