From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755176AbbCFCB4 (ORCPT ); Thu, 5 Mar 2015 21:01:56 -0500 Received: from shards.monkeyblade.net ([149.20.54.216]:37740 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754456AbbCFCBx (ORCPT ); Thu, 5 Mar 2015 21:01:53 -0500 Date: Thu, 05 Mar 2015 21:01:47 -0500 (EST) Message-Id: <20150305.210147.1680796621485642860.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, ebiederm@xmission.com Subject: Re: linux-next: build failure after merge of the net-next tree From: David Miller In-Reply-To: <20150306102614.206e5ec6@canb.auug.org.au> References: <20150305134247.5a55e4db@canb.auug.org.au> <20150305.000158.1662853297584626367.davem@davemloft.net> <20150306102614.206e5ec6@canb.auug.org.au> X-Mailer: Mew version 6.6 on Emacs 24.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.7 (shards.monkeyblade.net [149.20.54.216]); Thu, 05 Mar 2015 18:01:53 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Fri, 6 Mar 2015 10:26:14 +1100 > On Thu, 05 Mar 2015 00:01:58 -0500 (EST) David Miller wrote: >> >> From: Stephen Rothwell >> Date: Thu, 5 Mar 2015 13:42:47 +1100 >> >> > From: Stephen Rothwell >> > Date: Thu, 5 Mar 2015 13:37:05 +1100 >> > Subject: [PATCH] mpls: using vzalloc requires including vmalloc.h >> > >> > Fixes this build error: >> > >> > net/mpls/af_mpls.c: In function 'resize_platform_label_table': >> > net/mpls/af_mpls.c:767:4: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration] >> > labels = vzalloc(size); >> > ^ >> > >> > Fixes: 7720c01f3f59 ("mpls: Add a sysctl to control the size of the mpls label table") >> > Signed-off-by: Stephen Rothwell >> >> Applied, thanks Stephen. > > I don't see it in net-next? The perils of working on multiple workstations :-) Pushed out now, sorry about that.