* linux-next: manual merge of the dma-mapping tree with the driver-core tree
@ 2013-08-28 7:05 Stephen Rothwell
2013-08-28 17:26 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-08-28 7:05 UTC (permalink / raw)
To: Marek Szyprowski, Kyungmin Park
Cc: linux-next, linux-kernel, Hanjun Guo, Greg KH
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the dma-mapping tree with the driver-core tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2013-08-28 17:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Marek Szyprowski, Kyungmin Park, linux-next, linux-kernel, Hanjun Guo
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-28 17:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).