From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756029AbbHYUYm (ORCPT ); Tue, 25 Aug 2015 16:24:42 -0400 Received: from verein.lst.de ([213.95.11.211]:37350 "EHLO newverein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752896AbbHYUYl (ORCPT ); Tue, 25 Aug 2015 16:24:41 -0400 Date: Tue, 25 Aug 2015 22:24:39 +0200 From: Christoph Hellwig To: Guenter Roeck Cc: Christoph Hellwig , 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: <20150825202439.GA25236@lst.de> References: <20150825200756.GA25409@roeck-us.net> <20150825201532.GA24940@lst.de> <20150825202140.GB25409@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150825202140.GB25409@roeck-us.net> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 25, 2015 at 01:21:40PM -0700, Guenter Roeck wrote: > 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. Oh. That one clashes badly with my whole series, basically each of my patches will need the same work done for the other architectures applied to xtensa as well. In terms of effort it might be a better idea to rebase the patch from Max on top of the series, as it will become a lot simpler that way.