From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933445AbeAJFxo (ORCPT + 1 other); Wed, 10 Jan 2018 00:53:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40948 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932335AbeAJFxn (ORCPT ); Wed, 10 Jan 2018 00:53:43 -0500 Subject: Re: linux-next: build failure after merge of the net-next tree To: Stephen Rothwell , David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List References: <20180110150614.3fb5d9f1@canb.auug.org.au> From: Jason Wang Message-ID: Date: Wed, 10 Jan 2018 13:53:37 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180110150614.3fb5d9f1@canb.auug.org.au> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 10 Jan 2018 05:53:42 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 2018年01月10日 12:06, Stephen Rothwell wrote: > Hi all, > > After merging the net-next tree, today's linux-next build (sparc64 > defconfig) failed like this: > > net/socket.o: In function `tun_xdp_to_ptr': > (.text+0x3180): multiple definition of `tun_xdp_to_ptr' > fs/compat_ioctl.o:compat_ioctl.c:(.text+0x0): first defined here > net/socket.o: In function `tun_ptr_to_xdp': > (.text+0x31a0): multiple definition of `tun_ptr_to_xdp' > fs/compat_ioctl.o:compat_ioctl.c:(.text+0x20): first defined here > > Caused by commit > > fc72d1d54dd9 ("tuntap: XDP transmission") > > I applied the following fix for today: > > From: Stephen Rothwell > Date: Wed, 10 Jan 2018 15:01:41 +1100 > Subject: [PATCH] tuntap: fix for "tuntap: XDP transmission" > > Signed-off-by: Stephen Rothwell > --- > include/linux/if_tun.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h > index 08e66827ad8e..c5b0a75a7812 100644 > --- a/include/linux/if_tun.h > +++ b/include/linux/if_tun.h > @@ -42,11 +42,11 @@ static inline bool tun_is_xdp_buff(void *ptr) > { > return false; > } > -void *tun_xdp_to_ptr(void *ptr) > +static inline void *tun_xdp_to_ptr(void *ptr) > { > return NULL; > } > -void *tun_ptr_to_xdp(void *ptr) > +static inline void *tun_ptr_to_xdp(void *ptr) > { > return NULL; > } Acked-by: Jason Wang David, we need this for net-next, need I repost it? Thanks