On Mon, Jul 16 2007, Andrew Morton wrote: > On Mon, 16 Jul 2007 11:47:23 +0200 > Jens Axboe <jens.axboe@xxxxxxxxxx> wrote: > > > This prepares x86-64 for sg chaining support. > > > > Additional improvements/fixups for pci-gart from > > Benny Halevy <bhalevy@xxxxxxxxxxx> > > > > Cc: ak@xxxxxxx > > Signed-off-by: Jens Axboe <jens.axboe@xxxxxxxxxx> > > --- > > 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 :-) 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. -- Jens Axboe - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
