On 09/08/2015 08:21 PM, Linus Torvalds wrote:
> On Tue, Sep 8, 2015 at 9:24 AM, Doug Ledford <dledford@xxxxxxxxxx> wrote:
>>
>> Matan Barak (5):
>> net: Add info for NETDEV_CHANGEUPPER event
>
> Why the hell is this coming in through the infiniband tree? Especially
> with the networking tree having done the same thing differently?
Because the tree isn't buildable, let alone testable, without it.
> I see that Stephen Rothwell reported this almost two weeks ago, and
> informed you.
Yes, and he said he had a merge fixup and that it would carry forward.
I'm not real clear on how Stephen's stuff works, but when I'm told "I
can carry this going forward, no further action is needed on your part",
I took that at face value.
> The commit you send me, though, has been rebased since then, BUT IT
> STILL EXISTS.
Because I still need to be able to test. Originally you had said you
wanted the root of my pull requests to be based on something clean, such
as a known stable rc point or some such. But if I have to pull from
net-next in order to keep working on what I'm working on, that was a
no-no as I understood things. Unfortunately, overlap between the net
tree and the rdma tree is an all too common occurrence and so I'm going
to need to work out a workflow that satisfies all the various parties in
regards to it. Suggestions welcome.
> The commit is wrong, and you knew about it. So tell me, why the hell
> should I pull this shit?
I expected it to get fixed up properly by the merge commit Stephen was
carrying. I haven't seen any good documentation on exactly how his tree
works and what actions I might take and whether they will break it or
keep it from doing what it was supposed to do, but since the fixup was
there and meant to take care of this, I left things as they were. I
supposed I could have rebased and replaced that patch with the one in
Dave's tree. Would that have been preferable?
> Oh, yes, I can fix it in the merge. This is not a "I can't resolve
> this pull request" email. Resolving it in favor of the existing
> networking infrastructure is easy.
>
> This is a "why should I even bother?" email.
Well, I expected it to be handled without much effort on your part and
the existing network infrastructure to be the final version.
> The two different commits have very similar logic, somewhat similar
> names, but the details are different. Both were written by somebody
> with a "mellanox.com" address.
>
> One huge glaring difference is that one of them went through the
> networking maintainer, which matters a great deal since this is a
> networking notifier.
Sure, I agree.
> I did the pull, did most of the resolve, but then decided that I don't
> even want to merge this considering how questionable it was.
>
> This needs a good explanation, because for now this pull request is dead to me.
Is further explanation necessary, or have I answered your questions?
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
