On 04/07/2013 12:44 PM, Li Zefan wrote: > Hi, > > I'm rebasing this patchset against latest linux-next, and it conflicts with > "[PATCH v2] memcg: debugging facility to access dangling memcgs." slightly. > > That is a debugging patch and will never be pushed into mainline, so should I > still base this patchset on that debugging patch? > It will conflict as well with my shrinking patches: I will still keep the memcgs in the dangling list, but that will have nothing to do with debugging. So I will split that patch in a list management part, which will be used, and a debugging part (with the file + the debugging information). I will be happy to rebase it ontop of your series. > Also that patch needs update (and can be simplified) after this patchset: > - move memcg_dangling_add() to mem_cgroup_css_offline() > - remove memcg->memcg_name, and use cgroup_path() in mem_cgroup_dangling_read()? > Don't worry about it. If this is just this one patch conflicting, I would avise Andrew to remove it, and I will provide another (maybe two, already splitted up) version. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>