Re: [PATCH v6 0/5] memcg, cgroup: kill css id

From: Andrew Morton
Date: Mon Sep 23 2013 - 20:52:54 EST


On Tue, 24 Sep 2013 08:32:03 +0800 Li Zefan <lizefan@xxxxxxxxxx> wrote:

> On 2013/9/23 21:12, Tejun Heo wrote:
> > On Mon, Sep 23, 2013 at 09:08:16AM -0400, Tejun Heo wrote:
> >> Hello,
> >>
> >> On Mon, Sep 23, 2013 at 04:55:20PM +0800, Li Zefan wrote:
> >>> The whole patchset has been acked and reviewed by Michal and Tejun.
> >>> Could you merge it into mm tree?
> >>
> >> Ah... I really hoped that this had been merged during -rc1 window.
> >> Andrew, would it be okay to carry this series through cgroup tree? It
> >> doesn't really have much to do with mm proper and it's a PITA to have
> >> to keep updating css_id code from cgroup side when it's scheduled to
> >> go away. If carried in -mm, it's likely to cause conflicts with
> >> ongoing cgroup changes too.
>
> I would love to see this patchset go through cgroup tree. The changes to
> memcg is quite small,

It seems logical to put this in the cgroup tree as that's where most of
the impact occurs.

> and as -mm tree is based on -next it won't cause
> future conflicts.

That's no longer the case - I'm staging -mm patches ahead of linux-next
now. Except in cases where that's impractical, such as the 3.12 memcg
changes which were pretty heavily impacted by cgroups tree changes.

> >
> > Also, wasn't this already in -mm during the last devel cycle? ISTR
> > conflicts with it in -mm with other cgroup core changes. Is there any
> > specific reason why this wasn't merged during the merge windw?
> >
>
> No, it never went into -mm tree... I guess it's because Andrew was too
> busy and overlooked this patchset?

I'm not sure what happened to the August 7 patchset, actually. I don't
often overlook stuff - I'll skip things if the timing is terrible or if
the review comments indicate that another version is coming. But none
of that seems to be the case here. hmm...
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/