Re: nfsd 2.6.28 merge plans

David Howells
2008-11-20T14:27:44Z

Trond Myklebust <Trond.Myklebust@netapp.com> wrote:

> I'm happy with the changes that you made after the plumbers conf, so as
> far as the NFS side of the patches is concerned, we should be close to
> ready to merge.

Okay... I've fixed a couple of bugs and now it seems to survive multiple
parallel tars being repeatedly thrown at it.

How do you want to do this? I could make a GIT tree for you to pull, but it'd
have to be based on James Morris's next branch for the security features
required.

Alternatively, I could supply you with patches or a GIT tree, including the
security patches based on Linus's tree rather than James's.

Or we could wait until after the next merge window and hope Linus pulls them
this time (which he ought to, via James's tree).

David