From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755933AbbHYUVn (ORCPT ); Tue, 25 Aug 2015 16:21:43 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:38256 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751315AbbHYUVm (ORCPT ); Tue, 25 Aug 2015 16:21:42 -0400 Date: Tue, 25 Aug 2015 13:21:40 -0700 From: Guenter Roeck To: Christoph Hellwig Cc: Chris Zankel , Max Filippov , Andrew Morton , linux-xtensa@linux-xtensa.org, linux-kernel@vger.kernel.org Subject: Re: xtensa build failures in -next due to DMA API changes Message-ID: <20150825202140.GB25409@roeck-us.net> References: <20150825200756.GA25409@roeck-us.net> <20150825201532.GA24940@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150825201532.GA24940@lst.de> User-Agent: Mutt/1.5.23 (2014-03-12) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Christoph, On Tue, Aug 25, 2015 at 10:15:32PM +0200, Christoph Hellwig wrote: > Hi Guenter, > > > The problem seems to have been introduced with changes made by Christoph > > Hellwig, coming in through Andrew's tree. Copying them here for comments. > > xtensa doesn't use the generic dma map implementation, so it shouldn't > include dma-mapping-common.h anywhere, and in my tree it doesn't. > > Can you do a git-grep for dma-mapping-common.h on the tree that you > see this error on? Nothing but arch/*/include/asm/dma-mapping.h should > include it. In my tree it's all fine: > I also see arch/xtensa/include/asm/dma-mapping.h:#include It looks like there is a conflict with "xtensa: reimplement DMA API using common helpers" by Max Filippov, which added the include. This patch is in -next. Guenter