linux-kernel - Re: linux-next: manual merge of the workqueues 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]

Message-ID: <20120919183853.GM8474@google.com>
Date:	Wed, 19 Sep 2012 11:38:53 -0700
From:	Tejun Heo <tj@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Matthew Garrett <mjg@...hat.com>,
	Andre Przywara <andre.przywara@....com>,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: Re: linux-next: manual merge of the workqueues tree with the pm
 tree

On Wed, Sep 19, 2012 at 01:56:25PM +1000, Stephen Rothwell wrote:
> Hi Tejun,
> 
> Today's linux-next merge of the workqueues tree got a conflict in
> drivers/cpufreq/powernow-k8.c between commit e1f0b8e9b04a ("cpufreq:
> Remove support for hardware P-state chips from powernow-k8") from the pm
> tree and commit 5d7efe7bf90f ("cpufreq/powernow-k8: workqueue user
> shouldn't migrate the kworker to another CPU") from the workqueues tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).

Yeap, looks correct to me.  FYI, the change is likely to be pulled
into 3.6-rc6 soonish.

Thanks.

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