linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
	Thierry Reding <treding@nvidia.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree
Date: Mon, 27 Oct 2014 23:29:10 -0700	[thread overview]
Message-ID: <20141027232910.952850f8.akpm@linux-foundation.org> (raw)
In-Reply-To: <20141028152444.79bd9fe9@canb.auug.org.au>

On Tue, 28 Oct 2014 15:24:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the akpm-current tree got a conflict in
> mm/cma.c between commit 16195ddd4ebc ("mm: cma: Ensure that
> reservations never cross the low/high mem boundary") from the
> dma-mapping tree and commit 2a70e5a78672 ("mm/cma: ake kmemleak ignore
> CMA regions") from the akpm-current tree.

hm, we have multiple trees altering mm/cma.c?

I'm a bit surprised that this series was merged, given that Laurent
said he would be sending out a v2...

  reply	other threads:[~2014-10-28  6:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-28  4:24 linux-next: manual merge of the akpm-current tree with the dma-mapping tree Stephen Rothwell
2014-10-28  6:29 ` Andrew Morton [this message]
2014-10-28  6:54   ` Marek Szyprowski
2014-10-28 20:26     ` Andrew Morton
2018-05-10  6:39 Stephen Rothwell
2018-09-10  4:06 Stephen Rothwell
2019-06-03  5:01 Stephen Rothwell
2019-06-17  8:14 Stephen Rothwell
2019-06-17  8:15 ` Christoph Hellwig
2019-08-21  7:28 Stephen Rothwell
2019-09-16  2:46 Mark Brown
2020-09-16  4:11 Stephen Rothwell
2020-09-16  4:22 ` Song Bao Hua (Barry Song)
2020-09-16  4:35   ` Christoph Hellwig

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=20141027232910.952850f8.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=kyungmin.park@samsung.com \
    --cc=laurent.pinchart+renesas@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=sfr@canb.auug.org.au \
    --cc=treding@nvidia.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 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).