From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Christoph Hellwig <hch@lst.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Rob Herring <robh@kernel.org>, Sam Ravnborg <sam@ravnborg.org>
Subject: Re: linux-next: manual merge of the sparc-next tree with the dma-mapping tree
Date: Wed, 12 Dec 2018 08:44:20 +0100 [thread overview]
Message-ID: <20181212074420.GB29137@lst.de> (raw)
In-Reply-To: <20181212093042.00fbf6be@canb.auug.org.au>
On Wed, Dec 12, 2018 at 09:30:42AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sparc-next tree got a conflict in:
>
> arch/sparc/kernel/ioport.c
>
> between commit:
>
> 53b7670e5735 ("sparc: factor the dma coherent mapping into helper")
>
> from the dma-mapping tree and commit:
>
> 86ef771ed543 ("sparc: Use DT node full_name instead of name for resources")
>
> from the sparc-next tree.
Dave, Sam:
should I just apply a version of Rob's tree that takes the refactoring
into account to the dma-mapping tree? That way we should get the right
result independent of the merge order.
next prev parent reply other threads:[~2018-12-12 7:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 22:30 linux-next: manual merge of the sparc-next tree with the dma-mapping tree Stephen Rothwell
2018-12-12 7:44 ` Christoph Hellwig [this message]
2018-12-12 16:11 ` Christoph Hellwig
2018-12-12 16:32 ` Sam Ravnborg
2018-12-12 18:54 ` David Miller
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=20181212074420.GB29137@lst.de \
--to=hch@lst.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=sam@ravnborg.org \
--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