Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758629Ab3GPCon (ORCPT ); Mon, 15 Jul 2013 22:44:43 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:50943 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755098Ab3GPCom (ORCPT ); Mon, 15 Jul 2013 22:44:42 -0400 MIME-Version: 1.0 In-Reply-To: <20130715193224.dbbbfb02.akpm@linux-foundation.org> References: <1373898440-14208-1-git-send-email-bergwolf@gmail.com> <1373908589.2062.18.camel@joe-AO722> <20130715184030.GA17220@kroah.com> <20130715121357.42ef2826750909c1fc57788a@linux-foundation.org> <20130716000755.GC26261@kroah.com> <20130715193224.dbbbfb02.akpm@linux-foundation.org> From: Peng Tao Date: Tue, 16 Jul 2013 10:44:20 +0800 Message-ID: Subject: Re: [PATCH-v3 00/17] staging/lustre: fix various build issues To: Andrew Morton Cc: Greg Kroah-Hartman , Joe Perches , Linux Kernel Mailing List , Fengguang Wu , Stephen Rothwell , Andreas Dilger 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: 1048 Lines: 26 On Tue, Jul 16, 2013 at 10:32 AM, Andrew Morton wrote: > erk, I forgot about that. > > Please send Greg a full patchset against current Linus mainline. Then, > ideally, send me the patches which adapt that patchset to the new > shrinker API. > > Or don't worry about the second part and I'll fix things up at my end. The v3 patchset applies cleanly against current Linus mainline. Greg please merge them if they are OK to you. Andrew please just drop the fifth patch of the five. It is included in the patchset sent to Greg. The other four are shrinker API patches and can be applied cleanly. There is no conflict between the two patchsets except for the fifth one ([patch 5/5] staging/lustre: replace num_physpages with totalram_pages) that appears in both. Thanks, Tao -- 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/