Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760041AbYHVHFr (ORCPT ); Fri, 22 Aug 2008 03:05:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755283AbYHVHFj (ORCPT ); Fri, 22 Aug 2008 03:05:39 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:40545 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752433AbYHVHFi (ORCPT ); Fri, 22 Aug 2008 03:05:38 -0400 Date: Fri, 22 Aug 2008 09:04:50 +0200 From: Ingo Molnar To: FUJITA Tomonori Cc: joerg.roedel@amd.com, jbarnes@virtuousgeek.org, mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, muli@il.ibm.com Subject: Re: [PATCH 0/8] x86 dma_*_coherent rework patchset v2 Message-ID: <20080822070450.GX14110@elte.hu> References: <20080821231230V.fujita.tomonori@lab.ntt.co.jp> <20080822001238F.fujita.tomonori@lab.ntt.co.jp> <20080822064414.GT14110@elte.hu> <20080822155754C.fujita.tomonori@lab.ntt.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080822155754C.fujita.tomonori@lab.ntt.co.jp> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 930 Lines: 25 * FUJITA Tomonori wrote: > Can you drop the following patch in tip/x86/gart? > > commit 0bc65ffd52a78a65f582b42503f727b3f3773cc4 > Author: FUJITA Tomonori > 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. Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/