From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Len Brown <lenb@kernel.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrey Semin <andrey.semin@intel.com>
Subject: Re: linux-next: manual merge of the idle tree with the pm tree
Date: Tue, 14 Apr 2015 13:54:33 +0200 [thread overview]
Message-ID: <8775330.2mU8ydLUZv@vostro.rjw.lan> (raw)
In-Reply-To: <20150414124709.5f981d3c@canb.auug.org.au>
On Tuesday, April 14, 2015 12:47:09 PM Stephen Rothwell wrote:
>
> --Sig_/R75yz7NvQ/VA+OLEs7ruwVh
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> 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.
I've dropped the turbostat material (which apparently has been rebased after
I pulled it) from my linux-next branch.
Rafael
next prev parent reply other threads:[~2015-04-14 11:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 2:47 linux-next: manual merge of the idle tree with the pm tree Stephen Rothwell
2015-04-14 11:54 ` Rafael J. Wysocki [this message]
-- 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=8775330.2mU8ydLUZv@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=andrey.semin@intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).