linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the pm 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:	Tue, 29 Oct 2013 13:08:23 +0100
From:	"Rafael J. Wysocki" <rjw@...ysocki.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Nishanth Menon <nm@...com>,
	Tony Lindgren <tony@...mide.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pm tree

On Tuesday, October 29, 2013 07:00:21 PM Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/opp.c between commit e4db1c7439b3 ("PM / OPP: rename
> header to linux/pm_opp.h") from the pm tree and commit 92d51856d740
> ("ARM: OMAP3+: do not register non-dt OPP tables for device tree boot")
> from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The fix looks good to me, thanks for fixing this up.

Rafael

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)