Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753403Ab3FGIMs (ORCPT ); Fri, 7 Jun 2013 04:12:48 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:48129 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752393Ab3FGILk (ORCPT ); Fri, 7 Jun 2013 04:11:40 -0400 MIME-Version: 1.0 In-Reply-To: <20130607175244.95368825087acdfb25a2a8eb@canb.auug.org.au> References: <20130607162830.9d7ce277a9eda2b54fe73e92@canb.auug.org.au> <20130607175244.95368825087acdfb25a2a8eb@canb.auug.org.au> From: Peng Tao Date: Fri, 7 Jun 2013 16:11:17 +0800 Message-ID: Subject: Re: linux-next: build failure after merge of the akpm tree To: Stephen Rothwell Cc: Andrew Morton , linux-next@vger.kernel.org, Linux Kernel Mailing List , Dave Chinner , Glauber Costa , Greg KH , "Dilger, Andreas" 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: 2304 Lines: 48 On Fri, Jun 7, 2013 at 3:52 PM, Stephen Rothwell wrote: > Hi, > > On Fri, 7 Jun 2013 15:26:56 +0800 Peng Tao wrote: >> >> On Fri, Jun 7, 2013 at 2:28 PM, Stephen Rothwell wrote: >> > >> > After merging the akpm tree, today's linux-next build (x86_64 >> > allmodconfig) failed like this: >> > >> > In file included from drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h:49:0, >> > from drivers/staging/lustre/include/linux/libcfs/libcfs.h:44, >> > from drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h:45, >> > from drivers/staging/lustre/include/linux/lnet/lib-lnet.h:44, >> > from drivers/staging/lustre/lnet/lnet/api-ni.c:38: >> > drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h: In function 'set_shrinker': >> > drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h:102:3: error: 'struct shrinker' has no member named 'shrink' >> > s->shrink = func; >> > ^ >> > >> > Caused by commit a37f14f05f2f ("shrinker: Kill old ->shrink API") from >> > the akpm tree interacting with the new Lustre client code from the >> > staging tree. >> > >> > I have just disabled the Lustre client code again (by reverting commit >> > ee04fd11f11f ("Revert "Revert "staging/lustre: drop CONFIG_BROKEN >> > dependency""")) and maybe someone can tell me what I need to do to fix >> > this when I get back in a week. >> I have a patchset to fix this but haven't yet sent out because it will >> break build in Greg's staging tree. I can send it now but please tell >> me to whom I should send the patches? Greg's tree doesn't contain >> shrinker change, and mm- tree doesn't have Lustre code. > > The mm- tree now has the lustre code since it it based on most of > linux-next, so send them to Andrew. > > It will then be up to Andrew and Greg to make sure that the staging tree > is merged into Linus' tree before Andrew's patch bomb. I see. Thanks. I will send them to Andrew then. -- 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/