As far as I am aware the merge has everything contributed to the CVS tree.
Whats gone walkies ?
Nope, and I just checked once more. You didn't have the updated IP
masq stuff in the CVS checkout you used to merge up with Linus ;-)
Do a diff between CVS linux/net and the one Linus has right now ;-)
Later,
David S. Miller
davem@dm.cobaltmicro.com