From: Trond Myklebust <Trond.Myklebust@netapp.com>
To: andros@netapp.com, "Sager, Mike" <Mike.Sager@netapp.com>
Cc: linux-nfs@vger.kernel.org
Subject: Re: [PATCH 6/7] nfs41: implement cb_recall_slot
Date: Wed, 20 Jan 2010 16:27:29 -0500 [thread overview]
Message-ID: <1264022849.7799.4.camel@localhost> (raw)
In-Reply-To: <1264021587-27697-1-git-send-email-andros@netapp.com>
On Wed, 2010-01-20 at 16:06 -0500, andros@netapp.com wrote:
> Resend with fix to compile without CONFIG_NFS_V4_1.
>
> Sorry 'bout that Trond.
>
> -->Andy
No problem. However I did hit a conflict between your patchset and one
of Mike's. The conflicting patches were
commit 8f4a598ccfa936dc850323859af8f52bb1ef15c1 nfs41: back channel drc
minimal implementation
and
commit f93f599e8f6f8c26a99beb8324b15bc8c5f3663a nfs41: Process
callback's referring call list
Could you please both check that I fixed it up correctly in the
nfsv41-for-next branch?
Cheers
Trond
next prev parent reply other threads:[~2010-01-20 21:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-20 21:06 [PATCH 6/7] nfs41: implement cb_recall_slot andros
2010-01-20 21:06 ` andros
2010-01-20 21:27 ` Trond Myklebust [this message]
2010-01-21 16:33 ` Andy Adamson
-- strict thread matches above, loose matches on Subject: below --
2010-01-14 22:45 [PATCH 0/7] nfs41: return correct errors on callback replays version 3 andros
2010-01-14 22:45 ` [PATCH 1/7] nfs41: fix wrong error on callback header xdr overflow andros
2010-01-14 22:45 ` [PATCH 2/7] nfs41: directly encode back channel error andros
2010-01-14 22:45 ` [PATCH 3/7] nfs41: remove uneeded checks in callback processing andros
2010-01-14 22:45 ` [PATCH 4/7] nfs41: prepare for back channel drc andros
2010-01-14 22:45 ` [PATCH 5/7] nfs41: back channel drc minimal implementation andros
2010-01-14 22:45 ` [PATCH 6/7] nfs41: implement cb_recall_slot andros
2010-01-20 20:38 ` Trond Myklebust
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=1264022849.7799.4.camel@localhost \
--to=trond.myklebust@netapp.com \
--cc=Mike.Sager@netapp.com \
--cc=andros@netapp.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.