From: Vasily Gorbik <gor@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <jroedel@suse.de>,
Niklas Schnelle <schnelle@linux.ibm.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Upcoming merge conflict between s390 fixes and iommu trees
Date: Thu, 19 Oct 2023 17:17:31 +0200 [thread overview]
Message-ID: <your-ad-here.call-01697728651-ext-4593@work.hours> (raw)
Hi Stephen,
Hi Joerg,
I've just picked up commit
c1ae1c59c8c6 ("s390/pci: fix iommu bitmap allocation")
into the s390 fixes branch to still make it into v6.6 (and eventually
get into stable).
It will get conflicts in arch/s390/pci/pci_dma.c with commit
c76c067e488c ("s390/pci: Use dma-iommu layer")
from iommu tree, which is targeting the v6.7 merge window.
The latter commit removes arch/s390/pci/pci_dma.c, so that's
the way to go for the conflict resolution. Joerg, I believe it's your
decision whether you would like to mention this trivial merge conflict in
your pull request to Linus later.
Thank you.
next reply other threads:[~2023-10-19 15:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 15:17 Vasily Gorbik [this message]
2023-10-20 2:21 ` Upcoming merge conflict between s390 fixes and iommu trees Stephen Rothwell
2023-10-20 8:26 ` Jörg Rödel
2023-10-20 9:35 ` Vasily Gorbik
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=your-ad-here.call-01697728651-ext-4593@work.hours \
--to=gor@linux.ibm.com \
--cc=jroedel@suse.de \
--cc=linux-next@vger.kernel.org \
--cc=schnelle@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).