From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Matthew Garrett <mjg@redhat.com>,
Andre Przywara <andre.przywara@amd.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: linux-next: manual merge of the workqueues tree with the pm tree
Date: Wed, 19 Sep 2012 11:38:53 -0700 [thread overview]
Message-ID: <20120919183853.GM8474@google.com> (raw)
In-Reply-To: <20120919135625.875ebc4d68279b26f2375150@canb.auug.org.au>
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
prev parent reply other threads:[~2012-09-19 18:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 3:56 linux-next: manual merge of the workqueues tree with the pm tree Stephen Rothwell
2012-09-19 18:38 ` Tejun Heo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120919183853.GM8474@google.com \
--to=tj@kernel.org \
--cc=andre.przywara@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.