[Devel] Re: [PATCH 3/4] Move part of cpuacct code

Glauber Costa glommer at parallels.com
Sat Nov 26 12:17:33 PST 2011


On 11/26/2011 11:21 AM, Paul Turner wrote:
> On Thu, Nov 24, 2011 at 5:33 PM, Glauber Costa<glommer at parallels.com>  wrote:
>> This patch is just a preparation patch for the next one in the series.
>> It moves the cpuacct structure definition and some helper functions early
>> in the file so we can access its members from here on.
>>
>> Signed-off-by: Glauber Costa<glommer at parallels.com>
>> CC: Paul Tuner<pjt at google.com>
>> CC: Peter Zijlstra<a.p.zijlstra at chello.nl>
>> ---
>>   kernel/sched.c |   77 +++++++++++++++++++++++++++----------------------------
>>   1 files changed, 38 insertions(+), 39 deletions(-)
>
> Bad news -- You've run afoul of a massive file re-structuring conflict :(
>
> All of sched has been refactored under "kernel/sched/"; sched.c and
> friends don't exist anymore.
>
> - Paul

can you tell me where this lives? This does not seem to be the case in 
any of my git trees here (just fetched, including your sched.git/master 
at kernel.org)




More information about the Devel mailing list