linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Christoph Hellwig <hch@lst.de>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Huang Shijie <sjhuang@iluvatar.ai>
Subject: Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree
Date: Mon, 17 Jun 2019 10:15:20 +0200	[thread overview]
Message-ID: <20190617081520.GA7310@lst.de> (raw)
In-Reply-To: <20190617181439.42cf10e5@canb.auug.org.au>

On Mon, Jun 17, 2019 at 06:14:39PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   kernel/dma/remap.c
> 
> between commit:
> 
>   4b4b077cbd0a ("dma-remap: Avoid de-referencing NULL atomic_pool")
> 
> from the dma-mapping tree and commit:
> 
>   14de8ba3fa2e ("lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr")

I really wish we could drop this pointless rename, and also the export
until we have actual users.

  reply	other threads:[~2019-06-17  8:15 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-17  8:14 linux-next: manual merge of the akpm-current tree with the dma-mapping tree Stephen Rothwell
2019-06-17  8:15 ` Christoph Hellwig [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-16  4:11 Stephen Rothwell
2020-09-16  4:22 ` Song Bao Hua (Barry Song)
2020-09-16  4:35   ` Christoph Hellwig
2019-09-16  2:46 Mark Brown
2019-08-21  7:28 Stephen Rothwell
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=20190617081520.GA7310@lst.de \
    --to=hch@lst.de \
    --cc=akpm@linux-foundation.org \
    --cc=f.fainelli@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=sjhuang@iluvatar.ai \
    /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).