From: Greg KH <greg@kroah.com>
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,
Hanjun Guo <hanjun.guo@linaro.org>
Subject: Re: linux-next: manual merge of the dma-mapping tree with the driver-core tree
Date: Wed, 28 Aug 2013 10:26:18 -0700 [thread overview]
Message-ID: <20130828172618.GC5012@kroah.com> (raw)
In-Reply-To: <20130828170503.de07a17bcd5994a7434477da@canb.auug.org.au>
On Wed, Aug 28, 2013 at 05:05:03PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the dma-mapping tree got a conflict in
> drivers/base/dma-contiguous.c between commit cebcac7c59e8 ("drivers /
> dma-contiguous: Fix __init attribute location") from the driver-core tree
> and commit a2547380393a ("drivers: dma-contiguous: clean source code and
> prepare for device tree") from the dma-mapping tree.
>
> I fixed it up (the latter is a superset of the former, so I used that)
> and can carry the fix as necessary (no action is required).
Sounds good, thanks.
greg k-h
prev parent reply other threads:[~2013-08-28 17:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-28 7:05 linux-next: manual merge of the dma-mapping tree with the driver-core tree Stephen Rothwell
2013-08-28 17:26 ` Greg KH [this message]
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=20130828172618.GC5012@kroah.com \
--to=greg@kroah.com \
--cc=hanjun.guo@linaro.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--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;
as well as URLs for NNTP newsgroup(s).