lkml.org 
[lkml]   [2015]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the idle tree with the pm tree
Date
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



\
 
 \ /
  Last update: 2015-04-14 13:41    [W:0.030 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site