From: Linus Torvalds <torvalds@linux-foundation.org>
To: Christoph Hellwig <hch@infradead.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Michal Simek <monstr@monstr.eu>
Cc: xen-devel@lists.xenproject.org,
iommu <iommu@lists.linux-foundation.org>,
linux-mmc@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] dma-mapping updates for 5.4
Date: Thu, 19 Sep 2019 13:33:50 -0700 [thread overview]
Message-ID: <CAHk-=wjXF63BKNJH=GtnnoJmXZHEnRwjgeu4foJQvFYYBm9HHA@mail.gmail.com> (raw)
In-Reply-To: <20190918152748.GA21241@infradead.org>
On Wed, Sep 18, 2019 at 8:27 AM Christoph Hellwig <hch@infradead.org> wrote:
>
> please pull the dma-mapping updates for 5.4.
Pulled.
> In addition to the usual Kconfig conflics where you just want to keep
> both edits there are a few more interesting merge issues this time:
>
> - most importanly powerpc and microblaze add new callers of
> dma_atomic_pool_init, while this tree marks the function static
> and calls it from a common postcore_initcall(). The trivial
> functions added in powerpc and microblaze adding the calls
> need to be removed for the code to compile. This will not show up
> as a merge conflict and needs to be dealt with manually!
So I haven't gotten the powerpc or microblaze pull requests yet, so
I'm not able to fix that part up yet.
Intead, I'm cc'ing Michael Ellerman and Michal Simek to ask them to
remind me when they _do_ send those pull requests, since otherwise I
may well forget and miss it. Without an actual data conflict, and
since this won't show up in my build tests either, it would be very
easy for me to forget.
Micha[e]l, can you both please make sure to remind me?
Linus
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2019-09-19 20:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 15:27 [GIT PULL] dma-mapping updates for 5.4 Christoph Hellwig
2019-09-19 20:33 ` Linus Torvalds [this message]
2019-09-19 23:17 ` Michael Ellerman
2019-09-20 5:49 ` Michal Simek
2019-09-19 21:30 ` pr-tracker-bot
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='CAHk-=wjXF63BKNJH=GtnnoJmXZHEnRwjgeu4foJQvFYYBm9HHA@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=hch@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=monstr@monstr.eu \
--cc=mpe@ellerman.id.au \
--cc=xen-devel@lists.xenproject.org \
/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).