From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: Re: linux-next: build failure after merge of the final tree (net tree related) Date: Mon, 16 Jan 2012 11:36:22 +0400 Message-ID: <4F13D376.7020500@parallels.com> References: <20120109163812.4cb695944ea9716953afbfc9@canb.auug.org.au> <20120108.225225.1735038078666958154.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Cc: , , , To: David Miller Return-path: In-Reply-To: <20120108.225225.1735038078666958154.davem@davemloft.net> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 01/09/2012 10:52 AM, David Miller wrote: > From: Stephen Rothwell > Date: Mon, 9 Jan 2012 16:38:12 +1100 > >> I applied the following patch for today: >> >> From: Stephen Rothwell >> Date: Mon, 9 Jan 2012 16:33:16 +1100 >> Subject: [PATCH] net: sk_update_clone is only used in net/core/sock.c >> >> so move it there. Fixes build errors when CONFIG_INET is not defeined: >> >> In file included from include/linux/tcp.h:211:0, >> from include/linux/ipv6.h:221, >> from include/net/ipv6.h:16, >> from include/linux/sunrpc/clnt.h:26, >> from include/linux/nfs_fs.h:50, >> from init/do_mounts.c:20: >> include/net/sock.h: In function 'sk_update_clone': >> include/net/sock.h:1109:3: error: implicit declaration of function 'sock_update_memcg' [-Werror=implicit-function-declaration] >> >> Signed-off-by: Stephen Rothwell > > Applied, thanks Stephen. This is not the proper fix. Although it can stay for a matter of style if you guys prefer the inline function definition to live in sock.c since no one else uses it. I'll send a patch to fix this, that can live ontop of yours, shortly.