lkml.org 
[lkml]   [2014]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] please pull file locking changes for 3.15
On Mon, 7 Apr 2014 11:37:06 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jeff,
>
> On Fri, 4 Apr 2014 20:56:24 -0400 Jeff Layton <jlayton@redhat.com> 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@redhat.com>
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-04-07 14:01    [W:0.041 / U:0.436 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site