linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the arm 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 for Android: free password hash cracker in your pocket

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

Date:	Thu, 9 Feb 2012 16:25:22 -0800
From:	Olof Johansson <olof@...om.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Russell King <rmk@....linux.org.uk>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree

On Fri, Feb 10, 2012 at 10:50:26AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-at91/at91cap9.c between commit fa23e771d863 ("Merge branch
> 'fixes' into for-next") from the arm tree and commit 9918ceafd4a9 ("ARM:
> at91: code removal of CAP9 SoC") from the arm-soc tree.
> 
> The latter removes the file, so I did that.

Yep, that's the correct fixup.


Thanks,

-Olof
--
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/