lkml.org 
[lkml]   [2013]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: please cleanup the cpuidle tree
Hi Daniel,

All the commits in the cpuidle tree have been included upstream before
v3.6-rc1. They were rewritten before being merged upstream and so are
now causing merge conflicts in linux-next. Could you please reset the
head of your tree
(git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next) to
be somewhere in the tree that yours is merged into (pm or Linus').

Alternatively, if you are not using it any more, let me know and I will
remove it from linux-next.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-08 00:01    [W:0.064 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site