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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Wed, 7 Dec 2011 10:57:27 +0800
From:	Shawn Guo <shawn.guo@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Arnd Bergmann <arnd@...db.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Russell King <rmk@....linux.org.uk>,
	Lauri Hintsala <lauri.hintsala@...egiga.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree

Hi Stephen,

On 7 December 2011 07:52, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Arnd,
>
> Today's linux-next merge of the arm-soc tree got conflicts in
> arch/arm/mach-mxs/mach-m28evk.c and
> arch/arm/mach-mxs/mach-stmp378x_devb.c between commit d4e717535e94 ("ARM:
> restart: mxs: use new restart hook") from the arm tree and commit
> 8d2d2d1d7e96 ("ARM: mxs: fix machines' initializers order") from the
> arm-soc tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

The fix looks right.

Regards,
Shawn
--
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/