Re: [PULL REQUEST] Please pull rdma.git

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

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

On 01/23/2016 07:38 PM, Linus Torvalds wrote:
> On Sat, Jan 23, 2016 at 2:27 PM, Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>>
>>> So how ready and stable is this? IOW, if I do this pull, can I rely on
>>> that being "it", and really just get fixes.
>>
>> I still want to send the staging changes.
> 
> I'm not at all convinced I will pull them.
> 
> And I'm now looking at pulling the stuff you sent yesterday, and I'm
> close to just saying "screw this". Again.
> 
> This is now the *second* time that two different teams inside Mellanox
> decided to play games with the kernel maintainers, and I'm not at all
> sure the end result is not worth my time to sort out.

Understood.

> Doug, you need to stop taking patches from the Mellanox people until
> the get their shit together.  Really. I'll spend some time looking at
> this mess, but next time I see two Mellanox groups fighting inside
> their own driver, I will just not pull. It's that simple. If you take
> shit from them, I'll not take the end result.
> 
> I don't know what problem the Mellanox people have, but one group
> sends their changes through the networking tree, and another group
> sends it through you. They do similar things, but different enough to
> not be the same.
> 
> You tell them to stop sending that stuff to you, because I'm getting
> it through Davem. And I'm not interested in cleaning up after their
> mess.
> 
> Adding David and Mellanox people to the cc.
> 
> 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.  In both cases, the modification was part of a
larger series that was specific either to the network tree or the rdma
tree.  If that's the sort of thing you are talking about, I'm not sure
how we can resolve that.  The fact that the mlx4_core and mlx5_core
modules essentially straddle the networking and rdma trees presents a
unique situation with its own difficulties.  If the problem I listed is
what you are referring to, the only way I know to fix that is to have
Mellanox send all of their patches through one tree, and that means
either Dave or myself is going to have to deal with stuff they wouldn't
normally deal with.  Of course, if I'm wrong about what you are
referring to, then enlightenment would be appreciated ;-)

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



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