Re: git-net-fixup.patch added to -mm tree

[David S. Miller]

From: Andrew Morton <akpm@xxxxxxxx>
Date: Sun, 31 Jul 2005 22:21:25 -0700

> Actually, that patch is just a fixup for a patch reject from the net-2.6.14
> diff.  I do that sometimes when I get sick of fixing up the same reject
> each time I pull the various trees.
> 
> (I'm not sure _why_ I'm getting a reject applying that diff.  Nothing else
> touches that file.  git is not quite yet generating the linus->davem diff
> which I want..)

There is a tiny bit of conflicts between linux-2.6 and net-2.6.14,
because of some bug fixes that went into Linus's tree over the
past week.

I'll try to rebuild the net-2.6.14 tree if I get a chance before
heading off to the UK tomorrow.  That should help things out for
you.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/