Hello, Stephen, Andrew. I just applied rather invasive API update to cgroup/for-3.12, which led to conflicts in two files - include/net/netprio_cgroup.h and mm/memcontrol.c. The former is trivial context conflict and the two changes conflicting are independent. The latter contains several conflicts and unfortunately isn't trivial, especially the iterator update and the memcg patches should probably be rebased. I can hold back pushing for-3.12 into for-next until the memcg patches are rebased. Would that work? Thanks. -- tejun -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
