From: Vasily Gorbik <gor@linux.ibm.com>
To: "Jörg Rödel" <jroedel@suse.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Niklas Schnelle <schnelle@linux.ibm.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: Upcoming merge conflict between s390 fixes and iommu trees
Date: Fri, 20 Oct 2023 11:35:51 +0200 [thread overview]
Message-ID: <your-ad-here.call-01697794551-ext-4002@work.hours> (raw)
In-Reply-To: <0D650B3E-5E4D-406E-B5B5-E9135B97696B@suse.de>
On Fri, Oct 20, 2023 at 10:26:29AM +0200, Jörg Rödel wrote:
> > Am 19.10.2023 um 17:17 schrieb Vasily Gorbik <gor@linux.ibm.com>:
> >
> > 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.
>
> Thanks for the heads-up, I will probably resolve that in my merge-commit that will be the iommu/next branch, so upstream shouldn’t notice. I guess the fix will be in rc7?
That's the plan, I will send my pull request for rc7 tomorrow.
prev parent reply other threads:[~2023-10-20 9:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 15:17 Upcoming merge conflict between s390 fixes and iommu trees Vasily Gorbik
2023-10-20 2:21 ` Stephen Rothwell
2023-10-20 8:26 ` Jörg Rödel
2023-10-20 9:35 ` Vasily Gorbik [this message]
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-01697794551-ext-4002@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