Re: [PULL REQUEST] Please pull rdma.git

[Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 2398 bytes --]

On 01/23/2016 09:03 PM, Linus Torvalds wrote:
> On Sat, Jan 23, 2016 at 5:26 PM, Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> On 01/23/2016 07:38 PM, Linus Torvalds wrote:
>>>
>>> This kind of idiocy where one company has two different groups, and
>>> they are fighting over the same driver, and then expecting upstream to
>>> sort out their mental problems for them is not acceptable. It's not
>>> the job of either me or the subsystem maintainers to sort out your
>>> differences for you.
>>
>> Can I get some specifics of what you are talking about here?  The reason
>> I ask is that I know in this merge cycle there was a function modified
>> in the mlx4 driver (I think, or maybe mlx5) where it was first modified
>> by a patch series that went through Dave's tree, then further modified
>> by a series in my tree.
> 

[ snip detailed explanation of horrible merge mess ]

Thanks, that makes absolute sense.  Digging your eyeballs out with a
rusty spoon seems preferable in this case.

> In other words, there are lots of different alternatives to improve on
> what's going on. But this "throw crap against the wall and hope it
> sticks" approach that the two groups are clearly using now is *not*
> acceptable.

Agreed.

> If this was the first time it happened, I'd just be annoyed. As it is,
> something similar happened not that long ago, witht he same people. At
> this point I'm past "pissed", and firmly in "if this happens again,
> I'll just stop pulling the crap" camp.

Mellanox has been working to get one official Mellanox git repo through
which all of their patch submissions flow.  I'll simply stop taking
anything from them that doesn't come from this (yet to be announced
where it will live) git repo.  They can then merge their disparate
efforts prior to ever submitting them upstream to either Dave or myself.
 That should address the merge issue.  It won't, however, address
consistency issues in coding style.  That's something Mellanox will need
to address internally.  I know they have tapped Saeed to handle that
merge tree, and he's on the Cc: list here, so Saeed, you will need to
get your tree up sooner rather than later and I'll expect patch
submissions to start coming from you.

-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
              GPG KeyID: 0E572FDD



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]