From: Christoph Hellwig <hch@lst.de>
To: "Song Bao Hua (Barry Song)" <song.bao.hua@hisilicon.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>,
Christoph Hellwig <hch@lst.de>,
Mike Kravetz <mike.kravetz@oracle.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree
Date: Wed, 16 Sep 2020 06:35:24 +0200 [thread overview]
Message-ID: <20200916043524.GA6412@lst.de> (raw)
In-Reply-To: <a76cbfaaeeb14c4ca8b3f6a154fe0fa3@hisilicon.com>
On Wed, Sep 16, 2020 at 04:22:03AM +0000, Song Bao Hua (Barry Song) wrote:
> > c999bd436fe9 ("mm/cma: make number of CMA areas dynamic, remove
> > CONFIG_CMA_AREAS")
> >
> > from the akpm-current tree.
>
> I guess this is because Mike's patch was written on top of dma-mapping's next branch.
It wasn't.
> Will it be better to go through Christoph's tree?
I don't think this merge is much of a problem, we'll just need to tell
Linus about it.
next prev parent reply other threads:[~2020-09-16 4:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 4:11 linux-next: manual merge of the akpm-current tree with the dma-mapping tree Stephen Rothwell
2020-09-16 4:22 ` Song Bao Hua (Barry Song)
2020-09-16 4:35 ` Christoph Hellwig [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-16 2:46 Mark Brown
2019-09-16 2:46 ` Mark Brown
2019-08-21 7:28 Stephen Rothwell
2019-06-17 8:14 Stephen Rothwell
2019-06-17 8:15 ` Christoph Hellwig
2019-06-03 5:01 Stephen Rothwell
2018-09-10 4:06 Stephen Rothwell
2018-05-10 6:39 Stephen Rothwell
2014-10-28 4:24 Stephen Rothwell
2014-10-28 6:29 ` Andrew Morton
2014-10-28 6:54 ` Marek Szyprowski
2014-10-28 20:26 ` Andrew Morton
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=20200916043524.GA6412@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mike.kravetz@oracle.com \
--cc=sfr@canb.auug.org.au \
--cc=song.bao.hua@hisilicon.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.