From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753346AbZHMHLD (ORCPT ); Thu, 13 Aug 2009 03:11:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753291AbZHMHLB (ORCPT ); Thu, 13 Aug 2009 03:11:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59883 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753276AbZHMHLB (ORCPT ); Thu, 13 Aug 2009 03:11:01 -0400 Date: Thu, 13 Aug 2009 09:11:01 +0200 Message-ID: From: Takashi Iwai To: Benjamin Herrenschmidt Cc: FUJITA Tomonori , linuxppc-dev@lists.ozlabs.org, galak@kernel.crashing.org, beckyb@kernel.crashing.org, linux-kernel@vger.kernel.org, mingo@elte.hu Subject: Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h In-Reply-To: <1250146313.3587.113.camel@pasglop> References: <1249448908-18985-1-git-send-email-fujita.tomonori@lab.ntt.co.jp> <1250142522.3587.110.camel@pasglop> <1250146313.3587.113.camel@pasglop> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.3 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Thu, 13 Aug 2009 16:51:53 +1000, Benjamin Herrenschmidt wrote: > > On Thu, 2009-08-13 at 16:44 +1000, Benjamin Herrenschmidt wrote: > > On Wed, 2009-08-05 at 14:08 +0900, FUJITA Tomonori wrote: > > > > > The above swiotlb patchset was merged in -tip so I think that merging > > > this patchset via -tip too is the easiest way to handle this patchset. > > > > > > The patchset also is available via a git tree: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git powerpc > > > > Hi ! > > > > While I generally agree here with the patches, I'm not sure it should be > > merged via -tip since it mostly touches arch/powerpc files (and I need > > to review it a bit more carefully, hopefully you'll have Ack's hitting > > your mailbox later today). > > Maybe best is that I pull your series too. Note that your patch clashes > with Takashi's addition of dma_mmap_coherent() : > > http://patchwork.ozlabs.org/patch/29595/ > > Can you sort that out with Takashi as I'd like his patch in -next soon > too. I'm willing to rebase my patches to the generic dma_ops, so feel free to pull it first. It might need to add mmap_coherent op to all platforms when generic dma ops is used. This would be more volume but less hackish than the previous version, OTOH :) thanks, Takashi