On Mon, Jul 16 2007, Andrew Morton wrote:
> On Mon, 16 Jul 2007 22:10:03 +0200
> Jens Axboe <[email protected]> wrote:
>
> > On Mon, Jul 16 2007, Andrew Morton wrote:
> > > On Mon, 16 Jul 2007 11:47:23 +0200
> > > Jens Axboe <[email protected]> wrote:
> > >
> > > > This prepares x86-64 for sg chaining support.
> > > >
> > > > Additional improvements/fixups for pci-gart from
> > > > Benny Halevy <[email protected]>
> > > >
> > > > Cc: [email protected]
> > > > Signed-off-by: Jens Axboe <[email protected]>
> > > > ---
> > > > 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.
> > 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.
Seems so :)
--
Jens Axboe
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
