Hi Dave, Please consider adding the following fixes to your tree. The first is a remaining build bug, that managed to survive the bunch of randconfigs I tested with from my last fix (It still breaks without CONFIG_NET, which is likely selected by a bunch of other options). The other two patches are a fix for a bug I verified in my followup testings in the controller itself, that causes a charge/uncharge mismatch under certain circumnstances. Thanks Glauber Costa (3): net: fix socket memcg build with !CONFIG_NET cgroup: make sure memcg margin is 0 when over limit net: introduce res_counter_charge_nofail() for socket allocations include/linux/res_counter.h | 11 ++++++++++- include/net/sock.h | 12 +++++------- kernel/res_counter.c | 25 +++++++++++++++++++++++++ mm/memcontrol.c | 4 ++-- net/core/sock.c | 4 ++-- 5 files changed, 44 insertions(+), 12 deletions(-) -- 1.7.7.4 -- 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