[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20080822082328.GA27608@elte.hu>
Date: Fri, 22 Aug 2008 10:23:28 +0200
From: Ingo Molnar <mingo@...e.hu>
To: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
Cc: joerg.roedel@....com, jbarnes@...tuousgeek.org, mingo@...hat.com,
tglx@...utronix.de, hpa@...or.com, linux-kernel@...r.kernel.org,
iommu@...ts.linux-foundation.org, muli@...ibm.com
Subject: Re: [PATCH 0/8] x86 dma_*_coherent rework patchset v2
* FUJITA Tomonori <fujita.tomonori@....ntt.co.jp> wrote:
> On Fri, 22 Aug 2008 09:04:50 +0200
> Ingo Molnar <mingo@...e.hu> wrote:
>
> >
> > * FUJITA Tomonori <fujita.tomonori@....ntt.co.jp> wrote:
> >
> > > Can you drop the following patch in tip/x86/gart?
> > >
> > > commit 0bc65ffd52a78a65f582b42503f727b3f3773cc4
> > > Author: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
> > > Date: Mon Aug 18 00:36:18 2008 +0900
> > >
> > > x86 gart: allocate size-aligned address for alloc_coherent, v2
> > >
> > > Joerg's patchset and this patch slightly conflict with the above
> > > patch. I'll send a new patch against tip/x86/iommu shortly.
> >
> > such conflicts are no problem usually, check out the resolution in
> > tip/master - so there's no need to resend. Also, i just merged
> > tip/x86/gart into tip/x86/iommu, to make the integration even more
> > apparent.
>
> Ok, here's a patch against tip/x86/iommu:
>
> commit 0d8136ea509132c66155ca8a1e7cf60699f95c37
> Merge: 766af9f... 7b22ff5...
> Author: Ingo Molnar <mingo@...e.hu>
> Date: Fri Aug 22 09:03:43 2008 +0200
>
> Merge branch 'x86/gart' into x86/iommu
>
> =
> From: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
> Subject: [PATCH] gart: allocate size-aligned address for alloc_coherent
>
> alloc_coherent dma_ops callback was added to GART, however, it doesn't
> return a size aligned address wrt dma_alloc_coherent, as
> DMA-mapping.txt defines. This patch fixes it.
>
> This patch also removes unused gart_map_simple
> (dma_mapping_ops->map_simple has gone).
applied, thanks!
Ingo
--
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