* linux-next: manual merge of the trivial tree with the slave-dma tree
@ 2011-06-17 2:54 Stephen Rothwell
2011-06-17 2:56 ` Ryan Mallon
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-06-17 2:54 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Ryan Mallon, Mika Westerberg,
Vinod Koul
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-ep93xx/dma-m2p.c between commit 8e4a93008db7 ("ep93xx:
remove the old M2P DMA code") from the slave-dma tree and commit
1c5454eed85a ("Change Ryan Mallon's email address across the kernel")
from the trivial tree.
The former removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the slave-dma tree
2011-06-17 2:54 linux-next: manual merge of the trivial tree with the slave-dma tree Stephen Rothwell
@ 2011-06-17 2:56 ` Ryan Mallon
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Mallon @ 2011-06-17 2:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jiri Kosina, linux-next, linux-kernel, Mika Westerberg,
Vinod Koul
On 17/06/11 12:54, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-ep93xx/dma-m2p.c between commit 8e4a93008db7 ("ep93xx:
> remove the old M2P DMA code") from the slave-dma tree and commit
> 1c5454eed85a ("Change Ryan Mallon's email address across the kernel")
> from the trivial tree.
>
> The former removed the file, so I did that.
That is correct. Mika has added my new email address to the new ep93xx
dma files.
Thanks,
~Ryan
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-17 2:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-17 2:54 linux-next: manual merge of the trivial tree with the slave-dma tree Stephen Rothwell
2011-06-17 2:56 ` Ryan Mallon
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).