lkml.org 
[lkml]   [2016]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the rdma tree with the nfsd tree
From
Date

> On Jan 6, 2016, at 7:28 AM, Christoph Hellwig <hch@lst.de> wrote:
>
> On Wed, Jan 06, 2016 at 02:22:41PM +0200, Or Gerlitz wrote:
>> As I wrote here, the bits are already @ kernel.org
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git k.o/for-4.5
>
> Ok, that's a little confusing.
>
> Doug, any chance you could settle on one tree? I don't really care
> which one.

I use both, but for different things. For instance, when I had 9 out of 10 of Sagi’s patches for iSER applied and was waiting on the 10th patch to complete the set, I was willing to push that to my github tree so Sagi could check out how the first 9 had gone and double check my merge fixups while he rebased the 10th patch, but I didn’t want to push it to k.o. I don’t rebase on k.o, ever (something Linus was adamant about when I started doing this). But the github repo is released earlier and may be rebased. If it is a smooth merge window, there is little, if any, difference between the two. Only during merge windows when I am looking at different alternatives of controversial stuff does this seem to be an issue.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2016-01-06 19:21    [W:0.208 / U:0.200 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site