Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756860AbZAIVTo (ORCPT ); Fri, 9 Jan 2009 16:19:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753759AbZAIVTg (ORCPT ); Fri, 9 Jan 2009 16:19:36 -0500 Received: from smtp-out.google.com ([216.239.45.13]:26649 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753298AbZAIVTe (ORCPT ); Fri, 9 Jan 2009 16:19:34 -0500 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=mime-version:in-reply-to:references:date:message-id:subject:from:to: cc:content-type:content-transfer-encoding: x-gmailtapped-by:x-gmailtapped; b=antIv9ZnNGxNWoPUPXaUT44M25AtjDr85C9GwYlYRxEgmyNhS/eaNs8DJL5/g/2Z/ FsiGETWcqcgk+wLNLYq8Q== MIME-Version: 1.0 In-Reply-To: <4966B383.3030106@cn.fujitsu.com> References: <4966B383.3030106@cn.fujitsu.com> Date: Fri, 9 Jan 2009 13:19:30 -0800 Message-ID: <6599ad830901091319v405fd0do1424c737e8cb097@mail.gmail.com> Subject: Re: [PATCH] cgroups: consolidate cgroup documents From: Paul Menage To: Li Zefan Cc: Andrew Morton , Balbir Singh , KAMEZAWA Hiroyuki , LKML , Linux Containers Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-GMailtapped-By: 172.25.146.78 X-GMailtapped: menage Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7337 Lines: 161 On Thu, Jan 8, 2009 at 6:16 PM, Li Zefan wrote: > Move Documentation/cpusets.txt and Documentation/controllers/* to > Documentation/cgroups/ > > This inlined patch is generated with git-show -M (rename detected) > and is for review, and the attached one is for apply. > > Signed-off-by: Li Zefan Acked-by: Paul Menage Thanks. > --- > Documentation/cgroups/cgroups.txt | 5 +++-- > Documentation/cgroups/memcg_test.txt | 2 +- > Documentation/scheduler/sched-design-CFS.txt | 2 +- > include/linux/res_counter.h | 2 +- > init/Kconfig | 9 ++++----- > kernel/cpuset.c | 2 +- > 11 files changed, 11 insertions(+), 11 deletions(-) > > rename Documentation/{controllers => cgroups}/cpuacct.txt (100%) > rename Documentation/{ => cgroups}/cpusets.txt (100%) > rename Documentation/{controllers => cgroups}/devices.txt (100%) > rename Documentation/{controllers => cgroups}/memcg_test.txt (99%) > rename Documentation/{controllers => cgroups}/memory.txt (100%) > rename Documentation/{controllers => cgroups}/resource_counter.txt (100%) > > diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt > index e33ee74..d9e5d6f 100644 > --- a/Documentation/cgroups/cgroups.txt > +++ b/Documentation/cgroups/cgroups.txt > @@ -1,7 +1,8 @@ > CGROUPS > ------- > > -Written by Paul Menage based on Documentation/cpusets.txt > +Written by Paul Menage based on > +Documentation/cgroups/cpusets.txt > > Original copyright statements from cpusets.txt: > Portions Copyright (C) 2004 BULL SA. > @@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job > tracking. The intention is that other subsystems hook into the generic > cgroup support to provide new attributes for cgroups, such as > accounting/limiting the resources which processes in a cgroup can > -access. For example, cpusets (see Documentation/cpusets.txt) allows > +access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows > you to associate a set of CPUs and a set of memory nodes with the > tasks in each cgroup. > > diff --git a/Documentation/controllers/cpuacct.txt b/Documentation/cgroups/cpuacct.txt > similarity index 100% > rename from Documentation/controllers/cpuacct.txt > rename to Documentation/cgroups/cpuacct.txt > diff --git a/Documentation/cpusets.txt b/Documentation/cgroups/cpusets.txt > similarity index 100% > rename from Documentation/cpusets.txt > rename to Documentation/cgroups/cpusets.txt > diff --git a/Documentation/controllers/devices.txt b/Documentation/cgroups/devices.txt > similarity index 100% > rename from Documentation/controllers/devices.txt > rename to Documentation/cgroups/devices.txt > diff --git a/Documentation/controllers/memcg_test.txt b/Documentation/cgroups/memcg_test.txt > similarity index 99% > rename from Documentation/controllers/memcg_test.txt > rename to Documentation/cgroups/memcg_test.txt > index 08d4d3e..19533f9 100644 > --- a/Documentation/controllers/memcg_test.txt > +++ b/Documentation/cgroups/memcg_test.txt > @@ -6,7 +6,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior > is complex. This is a document for memcg's internal behavior. > Please note that implementation details can be changed. > > -(*) Topics on API should be in Documentation/controllers/memory.txt) > +(*) Topics on API should be in Documentation/cgroups/memory.txt) > > 0. How to record usage ? > 2 objects are used. > diff --git a/Documentation/controllers/memory.txt b/Documentation/cgroups/memory.txt > similarity index 100% > rename from Documentation/controllers/memory.txt > rename to Documentation/cgroups/memory.txt > diff --git a/Documentation/controllers/resource_counter.txt b/Documentation/cgroups/resource_counter.txt > similarity index 100% > rename from Documentation/controllers/resource_counter.txt > rename to Documentation/cgroups/resource_counter.txt > diff --git a/Documentation/scheduler/sched-design-CFS.txt b/Documentation/scheduler/sched-design-CFS.txt > index 8398ca4..6f33593 100644 > --- a/Documentation/scheduler/sched-design-CFS.txt > +++ b/Documentation/scheduler/sched-design-CFS.txt > @@ -231,7 +231,7 @@ CPU bandwidth control purposes: > > This options needs CONFIG_CGROUPS to be defined, and lets the administrator > create arbitrary groups of tasks, using the "cgroup" pseudo filesystem. See > - Documentation/cgroups.txt for more information about this filesystem. > + Documentation/cgroups/cgroups.txt for more information about this filesystem. > > Only one of these options to group tasks can be chosen and not both. > > diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h > index dede0a2..4c5bcf6 100644 > --- a/include/linux/res_counter.h > +++ b/include/linux/res_counter.h > @@ -9,7 +9,7 @@ > * > * Author: Pavel Emelianov > * > - * See Documentation/controllers/resource_counter.txt for more > + * See Documentation/cgroups/resource_counter.txt for more > * info about what this counter is. > */ > > diff --git a/init/Kconfig b/init/Kconfig > index 56fd93c..2af8382 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -323,8 +323,8 @@ config CGROUP_SCHED > This option allows you to create arbitrary task groups > using the "cgroup" pseudo filesystem and control > the cpu bandwidth allocated to each such task group. > - Refer to Documentation/cgroups.txt for more information > - on "cgroup" pseudo filesystem. > + Refer to Documentation/cgroups/cgroups.txt for more > + information on "cgroup" pseudo filesystem. > > endchoice > > @@ -335,10 +335,9 @@ menuconfig CGROUPS > use with process control subsystems such as Cpusets, CFS, memory > controls or device isolation. > See > - - Documentation/cpusets.txt (Cpusets) > - Documentation/scheduler/sched-design-CFS.txt (CFS) > - - Documentation/cgroups/ (features for grouping, isolation) > - - Documentation/controllers/ (features for resource control) > + - Documentation/cgroups/ (features for grouping, isolation > + and resource control) > > Say N if unsure. > > diff --git a/kernel/cpuset.c b/kernel/cpuset.c > index 647c77a..a856788 100644 > --- a/kernel/cpuset.c > +++ b/kernel/cpuset.c > @@ -568,7 +568,7 @@ update_domain_attr_tree(struct sched_domain_attr *dattr, struct cpuset *c) > * load balancing domains (sched domains) as specified by that partial > * partition. > * > - * See "What is sched_load_balance" in Documentation/cpusets.txt > + * See "What is sched_load_balance" in Documentation/cgroups/cpusets.txt > * for a background explanation of this. > * > * Does not return errors, on the theory that the callers of this > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/