From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763341AbXGPUkF (ORCPT ); Mon, 16 Jul 2007 16:40:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757195AbXGPUjv (ORCPT ); Mon, 16 Jul 2007 16:39:51 -0400 Received: from smtp2.linux-foundation.org ([207.189.120.14]:38023 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756683AbXGPUjt (ORCPT ); Mon, 16 Jul 2007 16:39:49 -0400 Date: Mon, 16 Jul 2007 13:34:27 -0700 From: Andrew Morton To: Jens Axboe Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, ak@suse.de Subject: Re: [PATCH 09/33] x86-64: update iommu/dma mapping functions to sg helpers Message-Id: <20070716133427.e212b753.akpm@linux-foundation.org> In-Reply-To: <20070716201002.GQ5195@kernel.dk> References: <11845792671245-git-send-email-jens.axboe@oracle.com> <11845792681830-git-send-email-jens.axboe@oracle.com> <20070716130608.4d096e29.akpm@linux-foundation.org> <20070716201002.GQ5195@kernel.dk> X-Mailer: Sylpheed version 2.2.7 (GTK+ 2.8.6; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 16 Jul 2007 22:10:03 +0200 Jens Axboe wrote: > On Mon, Jul 16 2007, Andrew Morton wrote: > > On Mon, 16 Jul 2007 11:47:23 +0200 > > Jens Axboe wrote: > > > > > This prepares x86-64 for sg chaining support. > > > > > > Additional improvements/fixups for pci-gart from > > > Benny Halevy > > > > > > Cc: ak@suse.de > > > Signed-off-by: Jens Axboe > > > --- > > > arch/x86_64/kernel/pci-calgary.c | 25 ++++++++------ > > > arch/x86_64/kernel/pci-gart.c | 63 ++++++++++++++++++++----------------- > > > arch/x86_64/kernel/pci-nommu.c | 5 ++- > > > 3 files changed, 51 insertions(+), 42 deletions(-) > > > > This causes fairly extensive destruction of 2.6.23 changes which are > > pending in Andi's tree. > > > > I shall drop the block tree until a) Andi has merged the pending Calgary > > changes and b) the block tree has been fixed up to account for those (and > > other) changes. > > > > Really, this was the perfectly worst time possible to go tromping all over > > everyone else's trees. > > Well, that's a bit hard for me to know, all I can do is push my stuff to > for-akpm so that it gets -mm exposure. If I don't, then you are yelling > at me as well :-) It is to be expected that there will be conflicts when making large-scale changes like this while there is 25MB of unmerged diff sitting out in 50 different trees. Doing it around the -rc1 time would be better. Even better would be not doing it at all: add the necessary stuff into the block core and then send the followup work to the relevant maintainers. ie: standard practice. > I'll keep rebasing sglist and the other branches I pull into for-akpm, > so you can just re-enable the for-akpm pull when the a) is true. Andi's tree is very out of date and is about to be damaged (to what extent I don't yet know) by a xen merge. I don't know if a) is going to happen. Things are more than usually messy this time around.