linux-kernel - Re: linux-next: manual merge of the trivial tree with the slave-dma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 17 Jun 2011 12:56:02 +1000
From:	Ryan Mallon <rmallon@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Jiri Kosina <jkosina@...e.cz>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Mika Westerberg <mika.westerberg@....fi>,
	Vinod Koul <vinod.koul@...el.com>
Subject: Re: linux-next: manual merge of the trivial tree with the slave-dma
 tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/