From: Benny Halevy <bhalevy@tonian.com>
To: Boaz Harrosh <bharrosh@panasas.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>, linux-nfs@vger.kernel.org
Subject: Re: nfsd (and lock) changes for 3.2
Date: Mon, 07 Nov 2011 18:21:10 +0200 [thread overview]
Message-ID: <4EB80576.4080301@tonian.com> (raw)
In-Reply-To: <4EB417C8.4000502@panasas.com>
On 2011-11-04 18:50, Boaz Harrosh wrote:
> On 11/04/2011 09:04 AM, J. Bruce Fields wrote:
>> Boaz points out that I forgot to add stable cc's to two commits:
>>
>> 48483bf23a568f3ef4cc7ad2c8f1a082f10ad0e7 "nfsd4: simplify recovery dir setting"
>> 6577aac01f00636c16cd583c30bd4dedf18475d5 "nfsd4: fix failure to
>> end nfsd4 grace period"
>>
>> which fix a regression introduced by
>> ab1350b2b3c1dd2e465a6abdda608d8c44facfb8 "nfsd41: Deny new lock before
>> RECLAIM_COMPLETE done" (first included in v3.1-rc1).
>>
>> Included below for reference, but I assume simplest for you will be to
>> cherry-pick the above two sha1's.
>>
>> Thanks!
>>
>> --b.
>>
>
> Bruce hi, thanks
>
> Yesterday I hit this bug again. I rebased on Benny's tree which did not have them
> for some reason. It's hunting me. ;-)
That's odd. What tip did you use? These patches should be there:
8474c1e95786608a79849070b34f93924fcad087
530b7be2fbd79a8758230d53fc5f050d5c1561ba
Benny
>
> Just for Future reference, these patches were suppose to be submitted very early around
> rc3 when we found them. This is what the -rcX are for, to test and fix what was broken
> in the merge window.
>
> Please forgive me I should have followed it through, but was too busy and forgot.
>
> But in general you should always have an rc-fixes branch and bug fixes patches
> should go there and not into the linux-next branch. And yes both branches should
> be included in linux-next.
>
> This way there is nothing to forget
>
> Thanks
> Boaz
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2011-11-07 16:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 12:19 nfsd (and lock) changes for 3.2 J. Bruce Fields
2011-10-25 12:34 ` J. Bruce Fields
2011-10-26 4:41 ` Tom Tucker
2011-10-26 8:59 ` J. Bruce Fields
2011-10-26 3:16 ` Boaz Harrosh
2011-10-26 3:31 ` Boaz Harrosh
2011-10-27 20:34 ` J. Bruce Fields
2011-10-28 0:23 ` Boaz Harrosh
2011-10-28 14:42 ` J. Bruce Fields
2011-11-04 16:04 ` J. Bruce Fields
2011-11-04 16:50 ` Boaz Harrosh
2011-11-04 17:45 ` J. Bruce Fields
2011-11-07 16:21 ` Benny Halevy [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=4EB80576.4080301@tonian.com \
--to=bhalevy@tonian.com \
--cc=bfields@fieldses.org \
--cc=bharrosh@panasas.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).