From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Len Brown <lenb@kernel.org>, "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrey Semin <andrey.semin@intel.com>
Subject: linux-next: manual merge of the idle tree with the pm tree
Date: Tue, 14 Apr 2015 12:47:09 +1000 [thread overview]
Message-ID: <20150414124709.5f981d3c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
Hi Len,
Today's linux-next merge of the idle tree got a conflict in
tools/power/x86/turbostat/turbostat.c between commits from the pm tree
and similar commits from the idle tree.
There seem to be two differnet version of these patches, so I just
dropped the idle tree for today, please sort this out.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-04-14 2:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 2:47 Stephen Rothwell [this message]
2015-04-14 11:54 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2014-11-17 1:54 Stephen Rothwell
2013-11-15 1:23 Stephen Rothwell
2013-11-15 15:22 ` Rafael J. Wysocki
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=20150414124709.5f981d3c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andrey.semin@intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®