Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1359200

Re: linux-next: manual merge of the rdma tree with the net-next tree

Show all headers | View raw

On Wed, Mar 16, 2016 at 10:35 AM, Doug Ledford <dledford@redhat.com> wrote:
> On 3/16/2016 1:18 PM, Linus Torvalds wrote:
>> On Tue, Mar 15, 2016 at 5:58 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>> is required).
>>
>> Side note: can you change this wording for your manual merge script?
>> Last merge window (or was it the one before it?) we had confusion with
>> people who thought that "no action is required" means "you can just
>> ignore this entirely".
>
> I certainly didn't take it that way regardless of the wording.

It was Or Gerlitz. You were cc'd, since it was the whole rdma Mellanox
mess. I quote from that thread:

 "> However, the fact that it got resolved in linux-next is purely
  > informational. It doesn't "fix" the conflict - it just means that both
  > sides should have gotten informed about it. That doesn't mean that the
  > conflict goes away or becomes better.

  That's news to me. When such things happen and caught by Stephen, we
  are getting an email saying something like

  "Today's linux-next merge of the infiniband tree got a conflict
  between commit X from net-next tree and commit Y from the infiniband
  tree. I fixed it up (see below) and can carry the fix as necessary (no
  action is required)."

  Also asked around a bit and got to learn on Stephen using git rerere,
  so all (no action needed note + seeing git rerere in action...) that
  leaded me to think that indeed no action is required from our side,
  but after reading your email (twice, so far), I realized that this was
  wrong conclusion."

So that whole "no action is required" wording very much has caused
confusion before in the rdma camp.

Let's fix the wording. I'm indeed hopeful that the rdma camp is now
keenly aware of the issues, but that doesn't change the fact that the
wording has been problematic.

                  Linus

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the rdma tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-16 02:00 +0100
  Re: linux-next: manual merge of the rdma tree with the net-next tree Maor Gottlieb <maor.linux@gmail.com> - 2016-03-16 15:30 +0100
  Re: linux-next: manual merge of the rdma tree with the net-next tree Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-16 18:20 +0100
    Re: linux-next: manual merge of the rdma tree with the net-next tree Doug Ledford <dledford@redhat.com> - 2016-03-16 18:40 +0100
      Re: linux-next: manual merge of the rdma tree with the net-next tree Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-16 18:50 +0100
    Re: linux-next: manual merge of the rdma tree with the net-next  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-16 22:00 +0100
      Re: linux-next: manual merge of the rdma tree with the net-next tree Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-16 22:10 +0100
      Re: linux-next: manual merge of the rdma tree with the net-next tree Andrew Lunn <andrew@lunn.ch> - 2016-03-16 22:20 +0100
        Re: linux-next: manual merge of the rdma tree with the net-next  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-16 23:40 +0100

csiph-web