From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: Re: [PATCH 3/4] Move part of cpuacct code Date: Sat, 26 Nov 2011 18:17:33 -0200 Message-ID: <4ED1495D.1090500@parallels.com> References: <1322184806-20421-1-git-send-email-glommer@parallels.com> <1322184806-20421-4-git-send-email-glommer@parallels.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii"; format="flowed" To: Paul Turner Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, lizf-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org, daniel.lezcano-GANU6spQydw@public.gmane.org, a.p.zijlstra-/NLkJaSkS4VmR6Xm/wNWPw@public.gmane.org, jbottomley-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devel-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org On 11/26/2011 11:21 AM, Paul Turner wrote: > On Thu, Nov 24, 2011 at 5:33 PM, Glauber Costa 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 >> CC: Paul Tuner >> CC: Peter Zijlstra >> --- >> 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) -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754393Ab1KZUSM (ORCPT ); Sat, 26 Nov 2011 15:18:12 -0500 Received: from mx2.parallels.com ([64.131.90.16]:34088 "EHLO mx2.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754199Ab1KZUSL (ORCPT ); Sat, 26 Nov 2011 15:18:11 -0500 Message-ID: <4ED1495D.1090500@parallels.com> Date: Sat, 26 Nov 2011 18:17:33 -0200 From: Glauber Costa User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0 MIME-Version: 1.0 To: Paul Turner CC: , , , , , , Subject: Re: [PATCH 3/4] Move part of cpuacct code References: <1322184806-20421-1-git-send-email-glommer@parallels.com> <1322184806-20421-4-git-send-email-glommer@parallels.com> In-Reply-To: Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [201.82.130.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/26/2011 11:21 AM, Paul Turner wrote: > On Thu, Nov 24, 2011 at 5:33 PM, Glauber Costa 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 >> CC: Paul Tuner >> CC: Peter Zijlstra >> --- >> 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)