Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Tue, 09 Dec 2008 15:22:38 -0800 (PST)

From: "J. Bruce Fields" <[email-masked]>
Date: Tue, 9 Dec 2008 17:17:08 -0500

> I could rebase nfsd onto net in this case if that'd simplify your life.
> Assuming net never rebases that wouldn't cause additional conflicts for
> you.

It never rebases, promise :-)