From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756535AbbHZH7U (ORCPT ); Wed, 26 Aug 2015 03:59:20 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:49428 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105AbbHZH7S (ORCPT ); Wed, 26 Aug 2015 03:59:18 -0400 Date: Wed, 26 Aug 2015 00:59:22 -0700 From: Andrew Morton To: Max Filippov Cc: Christoph Hellwig , Guenter Roeck , Chris Zankel , "linux-xtensa@linux-xtensa.org" , LKML Subject: Re: xtensa build failures in -next due to DMA API changes Message-Id: <20150826005922.e86ead7c.akpm@linux-foundation.org> In-Reply-To: References: <20150825200756.GA25409@roeck-us.net> <20150825201532.GA24940@lst.de> <20150825202140.GB25409@roeck-us.net> <20150825202439.GA25236@lst.de> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 26 Aug 2015 10:53:25 +0300 Max Filippov wrote: > On Tue, Aug 25, 2015 at 11:24 PM, Christoph Hellwig wrote: > > 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. > > Looks like I just need to remove now redundant function definitions from > xtensa/include/asm/dma-mapping.h. A patch that removes these > functions is attached, but I'm not sure where it should go. To the Andrew's > tree? Or should the xtensa tree merge Christoph's series and apply it on > top? I can add it to Christoph's patch series. This means that I won't be merging Christoph's patches until you've sent your queue in to Linus, so please don't leave it too late in the merge window.