From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: linux-next: manual merge of the akpm tree with the tip tree Date: Thu, 26 Jul 2012 11:05:01 -0700 Message-ID: <20120726110501.e296b672.akpm@linux-foundation.org> References: <20120725140827.4332a5448e4d8d200164ea2e@canb.auug.org.au> <20120725071044.GA27535@gmail.com> <20120725073503.GB1112@cmpxchg.org> <20120725115713.e56239b5.akpm@linux-foundation.org> <20120725190351.GA4143@gmail.com> <20120725122613.b971360b.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120725122613.b971360b.akpm@linux-foundation.org> Sender: linux-kernel-owner@vger.kernel.org To: Ingo Molnar , Johannes Weiner , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lee Schermerhorn , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra List-Id: linux-next.vger.kernel.org On Wed, 25 Jul 2012 12:26:13 -0700 Andrew Morton wrote: > On Wed, 25 Jul 2012 21:03:51 +0200 > Ingo Molnar wrote: > > > > This means that if the above code reappears in linux-next or > > > mainline, the current copy of > > > mm-memcg-fix-compaction-migration-failing-due-to-memcg-limits.patch > > > will no longer update it, and I probably won't notice that > > > omission. > > > > Did you plan to send Johannes's memcg bits to Linus in this > > merge window? > > Yes. I was kinda thinking of starting the bombing run on Monday but I > guess I could do the MM queue on Thursday. Sorry, this didn't work out: there's still too much stuff which hasn't gone into mainline yet (slab, NFS, others). Merging the MM code now would involve a worrying amount of last-minute code rework and would cause the owners of those trees to have to do last-minute rework as well. This is why I always go last. I'll take another look on Monday.