[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090528163853Q.fujita.tomonori@lab.ntt.co.jp>
Date: Thu, 28 May 2009 16:44:56 +0900
From: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
To: akpm@...ux-foundation.org
Cc: fujita.tomonori@....ntt.co.jp, linux-kernel@...r.kernel.org,
mingo@...e.hu, tony.luck@...el.com, linux-ia64@...r.kernel.org,
arnd@...db.de, joerg.roedel@....com
Subject: Re: [PATCH -tip v2 0/5] add common functions for struct dma_map_ops
Thanks for picking up the patchset,
On Thu, 28 May 2009 00:20:20 -0700
Andrew Morton <akpm@...ux-foundation.org> wrote:
> On Fri, 15 May 2009 12:55:00 +0900 FUJITA Tomonori <fujita.tomonori@....ntt.co.jp> wrote:
>
> > We unified x86 and IA64's handling of multiple dma mapping operations
> > (struct dma_map_ops in linux/dma-mapping.h) so we can remove
> > duplication in their arch/include/asm/dma-mapping.h.
> >
> > This patchset adds include/asm-generic/dma-mapping-common.h that
> > provides some generic dma mapping function definitions for the users
> > of struct dma_map_ops. This enables us to remove about 100 lines. This
> > also enables us to easily add CONFIG_DMA_API_DEBUG support, which only
> > x86 supports for now. The 4th patch adds CONFIG_DMA_API_DEBUG support
> > to IA64 by adding only 8 lines.
> >
> > This is against tip/master since tip has some changes to
> > arch/x86/include/asm/dma-mapping.h.
> >
> > The changes since the first version are
> >
> > - fixed a bug that dma_attrs is not passed properly (thanks to Arnd
> > Bergmann).
> >
> > - used a new name, dma-mapping-common.h, instead of dma-mapping.h
> > (suggested by Arnd Bergmann).
> >
> > - added Joerg's Acked-by
> >
> > =
> > arch/ia64/Kconfig | 1 +
> > arch/ia64/include/asm/dma-mapping.h | 110 ++----------------
> > arch/x86/Kconfig | 1 +
> > arch/x86/include/asm/dma-mapping.h | 174 +---------------------------
> > include/asm-generic/dma-mapping-common.h | 190 ++++++++++++++++++++++++++++++
> > lib/dma-debug.c | 82 ++++++++------
> > 6 files changed, 252 insertions(+), 306 deletions(-)
>
> I'm hoping that a suitable merge scheme here would be for me to merge
> 1/5 into mainline then to send 2/5 to Ingo and 3/5, 4/5 and 5/5 to Tony
> for merging. Will that all compile and work?
Yes, it works. The X86 patch (2/5) and the IA64 patches (3/5, 4/5, and
5/5) can be merged independently. Both depends on the first patch (1/5).
> Alternatively I can merge the lot, with suitable acking.
It would be easier, I think.
Thanks,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists