From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935138AbdADAL5 (ORCPT ); Tue, 3 Jan 2017 19:11:57 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:32857 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753318AbdADALr (ORCPT ); Tue, 3 Jan 2017 19:11:47 -0500 Date: Tue, 3 Jan 2017 19:11:38 -0500 From: Konrad Rzeszutek Wilk To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: build failure after merge of the swiotlb tree Message-ID: <20170104001138.GA22030@char.us.oracle.com> References: <20170104105749.6f305c35@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170104105749.6f305c35@canb.auug.org.au> User-Agent: Mutt/1.7.1 (2016-10-04) X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 04, 2017 at 10:57:49AM +1100, Stephen Rothwell wrote: > Hi Konrad, > > After merging the swiotlb tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > net/bridge/br_input.o: In function `.swiotlb_max_segment': > (.text+0x780): multiple definition of `.swiotlb_max_segment' > net/bridge/br.o:br.c:(.text+0x3c0): first defined here > > and many, many more :-( > Caused by commit > > f196f1294fd2 ("swiotlb: Export swiotlb_max_segment to users") > > Forgotten "static nline" in include/linux/swiotlb.h ... Duh! Fixed it up and pushed the fix in. Thanks! > > I have used the swiotlb tree from next-20170103 for today. > > -- > Cheers, > Stephen Rothwell