(sorry for the delayed reply) Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > > Fix some cgroup messages to read better. > Update MAINTAINERS to include mm/*cgroup* files. > > Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > --- > MAINTAINERS | 1 + > mm/page_cgroup.c | 14 +++++++------- > 2 files changed, 8 insertions(+), 7 deletions(-) > > --- lnx-2630-rc3.orig/mm/page_cgroup.c > +++ lnx-2630-rc3/mm/page_cgroup.c > @@ -83,12 +83,12 @@ void __init page_cgroup_init(void) > goto fail; > } > printk(KERN_INFO "allocated %ld bytes of page_cgroup\n", total_usage); > - printk(KERN_INFO "please try cgroup_disable=memory option if you" > - " don't want\n"); > + printk(KERN_INFO "please try 'cgroup_disable=memory' option if you" > + " don't want memory cgroups\n"); > return; > fail: > - printk(KERN_CRIT "allocation of page_cgroup was failed.\n"); > - printk(KERN_CRIT "please try cgroup_disable=memory boot option\n"); > + printk(KERN_CRIT "allocation of page_cgroup failed.\n"); > + printk(KERN_CRIT "please try 'cgroup_disable=memory' boot option\n"); > panic("Out of memory"); > } > > @@ -257,14 +257,14 @@ void __init page_cgroup_init(void) > fail = init_section_page_cgroup(pfn); > } > if (fail) { > - printk(KERN_CRIT "try cgroup_disable=memory boot option\n"); > + printk(KERN_CRIT "try 'cgroup_disable=memory' boot option\n"); > panic("Out of memory"); > } else { > hotplug_memory_notifier(page_cgroup_callback, 0); > } > printk(KERN_INFO "allocated %ld bytes of page_cgroup\n", total_usage); > - printk(KERN_INFO "please try cgroup_disable=memory option if you don't" > - " want\n"); > + printk(KERN_INFO "please try 'cgroup_disable=memory' option if you don't" > + " want memory cgroups\n"); > } > > void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat) > --- lnx-2630-rc3.orig/MAINTAINERS > +++ lnx-2630-rc3/MAINTAINERS > @@ -1519,6 +1519,7 @@ L: containers@xxxxxxxxxxxxxxxxxxxxxxxxxx > S: Maintained > F: include/linux/cgroup* > F: kernel/cgroup* May be we should fix it like this: F: include/linux/cgroup.h F: kernel/cgroup.c F: kernel/cgroup_debug.c ? Since the authors of kernel/cgroup_freezer.c are Matt Helsley <matthltc@xxxxxxxxxx> and Cedric Le Goater <clg@xxxxxxxxxx>. And the author of net/sched/cls_cgroup.c is Thomas Graf <tgraf@xxxxxxx>, And the maintainer of kernel/ns_cgroup.c and security/device_cgroup.c is Serge E. Hallyn <serue@xxxxxxxxxx>. > +F: mm/*cgroup* > And this belongs to memory resource controller (grep 'MEMORY RESOURCE CONTROLLER' in MAINTAINERS). The maintainers of mm/page_cgroup.c and mm/memcontrol.c are Balbir and Kamezawa. > CORETEMP HARDWARE MONITORING DRIVER > P: Rudolf Marek > > _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers