linux-kernel - Re: linux-next: manual merge of the imx-mxs 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:	Thu, 4 Apr 2013 10:49:32 +0530
From:	Viresh Kumar <viresh.kumar@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Shawn Guo <shawn.guo@...aro.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Markus Pargmann <mpa@...gutronix.de>,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the pm tree

On 4 April 2013 10:48, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Today's linux-next merge of the imx-mxs tree got a conflict in
> arch/arm/mach-imx/cpufreq.c between commits b43a7ffbf33b ("cpufreq:
> Notify all policy->cpus in cpufreq_notify_transition()") and eb2f50ff93f0
> ("cpufreq: drivers: Remove unnecessary assignments of policy-> members")
> from the pm tree and commit 180cb7d6ab8c ("ARM: imx: Remove cpufreq
> driver") from the imx-mxs tree.
>
> The latter removed the file, so I just did that and can carry the fix as
> necessary (no action is required).

Thanks. Looks correct.
--
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/