lkml.org 
[lkml]   [2007]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 09/33] x86-64: update iommu/dma mapping functions to sg helpers
    On Tue, Jul 17 2007, Jens Axboe wrote:
    > On Mon, Jul 16 2007, Andrew Morton wrote:
    > > On Mon, 16 Jul 2007 22:10:03 +0200
    > > Jens Axboe <jens.axboe@oracle.com> wrote:
    > >
    > > > On Mon, Jul 16 2007, Andrew Morton wrote:
    > > > > On Mon, 16 Jul 2007 11:47:23 +0200
    > > > > Jens Axboe <jens.axboe@oracle.com> wrote:
    > > > >
    > > > > > This prepares x86-64 for sg chaining support.
    > > > > >
    > > > > > Additional improvements/fixups for pci-gart from
    > > > > > Benny Halevy <bhalevy@panasas.com>
    > > > > >
    > > > > > Cc: ak@suse.de
    > > > > > Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    > > > > > ---
    > > > > > 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 do that. Most of the stuff is trivial, but the x86-64 iommu changes
    > are probably the most tricky and invasive of them all.

    OK, this is what I did:

    Split the set into 3, in the following order:

    CORE -> DRIVERS -> ARCH

    So that's 3 branches, core is based off master, drivers off core, and
    arch off drivers. I'll push core+drivers into #for-akpm for testing,
    then the arch bits will stay undisturbed until acked by maintainers.

    --
    Jens Axboe

    -
    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/

    \
     
     \ /
      Last update: 2007-07-17 09:59    [W:4.030 / U:57.828 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site