From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx200.postini.com [74.125.245.200]) by kanga.kvack.org (Postfix) with SMTP id CFED36B0036 for ; Thu, 8 Aug 2013 20:34:06 -0400 (EDT) Received: by mail-vc0-f177.google.com with SMTP id gf12so607907vcb.22 for ; Thu, 08 Aug 2013 17:34:05 -0700 (PDT) Date: Thu, 8 Aug 2013 20:34:02 -0400 From: Tejun Heo Subject: [HEADSUP] conflicts between cgroup/for-3.12 and memcg Message-ID: <20130809003402.GC13427@mtj.dyndns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: owner-linux-mm@kvack.org List-ID: To: sfr@canb.auug.org.au, Andrew Morton Cc: linux-next@vger.kernel.org, Johannes Weiner , Michal Hocko , Balbir Singh , KAMEZAWA Hiroyuki , cgroups@vger.kernel.org, linux-mm@kvack.org 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org