Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753224Ab3GNT6n (ORCPT ); Sun, 14 Jul 2013 15:58:43 -0400 Received: from mail-vb0-f48.google.com ([209.85.212.48]:41093 "EHLO mail-vb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753162Ab3GNT6m (ORCPT ); Sun, 14 Jul 2013 15:58:42 -0400 MIME-Version: 1.0 In-Reply-To: References: Date: Sun, 14 Jul 2013 12:58:41 -0700 X-Google-Sender-Auth: oxHTIWREUdgz_SvnudVLYPpUe7Y Message-ID: Subject: Re: [GIT PULL] SLAB changes for v3.11-rc0 From: Linus Torvalds To: Pekka Enberg Cc: Andrew Morton , Christoph Lameter , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 770 Lines: 19 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. Linus -- 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/