Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754013Ab3GOGMf (ORCPT ); Mon, 15 Jul 2013 02:12:35 -0400 Received: from mail-la0-f48.google.com ([209.85.215.48]:55013 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752622Ab3GOGMe (ORCPT ); Mon, 15 Jul 2013 02:12:34 -0400 Message-ID: <51E392CE.9000605@kernel.org> Date: Mon, 15 Jul 2013 09:12:30 +0300 From: Pekka Enberg User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130311 Thunderbird/17.0.4 MIME-Version: 1.0 To: Linus Torvalds CC: Andrew Morton , Christoph Lameter , Linux Kernel Mailing List Subject: Re: [GIT PULL] SLAB changes for v3.11-rc0 References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 871 Lines: 23 On 07/14/2013 10:58 PM, Linus Torvalds wrote: > On Sun, Jul 14, 2013 at 12:06 PM, Pekka Enberg wrote: >> >> The tree also contains Christoph's unification work that I merged in >> too late had to revert because it broke things. We'll try again for >> v3.12. > > Ugh. I'll merge the commits leading up to that, but not the actual > broken try at unification at all. > > There's just one one-liner patch in between the broken commits and > their reverts, I don't see the point of pulling that part at all, and > I can take the one-liner separately. OK, I'll requeue the oneliner commit. Thanks! Pekka -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/