linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-fsdevel
	<linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: Re: shrinking set of cifs fixes to merge for 2.6.39 to small set
Date: Tue, 12 Apr 2011 09:16:57 -0400	[thread overview]
Message-ID: <20110412091657.0a2ed527@corrin.poochiereds.net> (raw)
In-Reply-To: <BANLkTin627FFHH_mt1Lu7TMVMAb5y-DKgg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>

On Tue, 12 Apr 2011 07:30:14 -0500
Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

> On Tue, Apr 12, 2011 at 6:51 AM, Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> > On Mon, 11 Apr 2011 20:33:42 -0500
> > Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> >
> >> Since it is already past the merge window (was waiting to discuss some
> >> fixes with others at the fs summit last week before merge),  I shrunk
> >> the list of cifs patches waiting for merge (in cifs-2.6.git) to a much
> >> smaller set of more critical ones. See below. (I moved the others
> >> temporarily to a for-2.6.40 branch in cifs-2.6.git).  We (Jeff,
> >> Shirish, I etc.) need to build/test more with this set before sending
> >> though.
> >>
> >> Jeff Layton (8):
> >>       cifs: check for private_data before trying to put it
> >>       cifs: replace /proc/fs/cifs/Experimental with a module parm
> >
> >        I think we should also put in the patch that adds the
> >        page_mkwrite handler.
> 
> I agree but it had more merge conflicts.
> 

Ok, I just resent the patch with the merge conflicts fixed.

I've also given the set you're proposing + the page_mkwrite patch a
quick smoke test run with connectathon and it seems to be ok.

-- 
Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

      parent reply	other threads:[~2011-04-12 13:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-12  1:33 shrinking set of cifs fixes to merge for 2.6.39 to small set Steve French
2011-04-12 11:51 ` Jeff Layton
     [not found]   ` <20110412075144.53180566-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org>
2011-04-12 12:30     ` Steve French
     [not found]       ` <BANLkTin627FFHH_mt1Lu7TMVMAb5y-DKgg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-04-12 13:16         ` Jeff Layton [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=20110412091657.0a2ed527@corrin.poochiereds.net \
    --to=jlayton-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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).