Re: [GIT PULL] please pull file locking changes for 3.15

[Jeff Layton]

On Mon, 7 Apr 2014 11:37:06 +1000
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi Jeff,
> 
> On Fri, 4 Apr 2014 20:56:24 -0400 Jeff Layton <jlayton@xxxxxxxxxx> wrote:
> >
> > Thanks for the feedback and for pulling this in anyway. I'll make sure
> > to do all of that on subsequent pull requests.
> 
> Also, please don't rebase what you have in linux-next before sending it to
> Linus (without good reason).  Especially if you then leave the linux-next
> included branch as it was - since that may cause conflicts in my tree
> (and so I notice the rebase).
> 

I don't think I did that though, did I? Both the branches I had in this
case were based on 3.13-rc1.

Now that Linus has pulled in the changes, am I OK to rebase the
branches (or do a pull)?

-- 
Jeff Layton <jlayton@xxxxxxxxxx>

Attachment: signature.asc
Description: PGP signature