From: David Howells <dhowells@redhat.com>
To: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: dhowells@redhat.com, Andrew Morton <akpm@linux-foundation.org>,
"J. Bruce Fields" <bfields@fieldses.org>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
jmorris@namei.org
Subject: Re: nfsd 2.6.28 merge plans
Date: Thu, 20 Nov 2008 14:25:55 +0000 [thread overview]
Message-ID: <10442.1227191155@redhat.com> (raw)
In-Reply-To: <1224017504.8907.42.camel@localhost>
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
prev parent reply other threads:[~2008-11-20 14:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-08 23:22 nfsd 2.6.28 merge plans J. Bruce Fields
2008-10-14 19:07 ` Andrew Morton
2008-10-14 20:33 ` David Howells
2008-10-14 20:51 ` Trond Myklebust
2008-10-15 9:17 ` David Howells
2008-11-20 14:25 ` David Howells [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10442.1227191155@redhat.com \
--to=dhowells@redhat.com \
--cc=Trond.Myklebust@netapp.com \
--cc=akpm@linux-foundation.org \
--cc=bfields@fieldses.org \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox