linux-kernel - Re: manual merge of the mvebu 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] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 8 Oct 2013 10:08:07 -0400
From:	Jason Cooper <jason@...edaemon.net>
To:	Thierry Reding <thierry.reding@...il.com>
Cc:	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: manual merge of the mvebu tree

On Tue, Oct 08, 2013 at 03:44:13PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the mvebu tree got conflicts in:
> 
> 	arch/arm/mach-dove/board-dt.c
> 
> caused by commits ffe195c (ARM: dove: remove legacy pcie and clock init),
> e3730b4 (ARM: dove: switch to DT probed mbus address windows), and 51e40f5
> (ARM: dove: remove custom .init_time hook).
> 
> I fixed them up (see below). Please verify that the resolution looks
> correct.

Looks good to me, thanks!

thx,

Jason.
--
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/