linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Jason Gunthorpe <jgg@mellanox.com>
Cc: Doug Ledford <dledford@redhat.com>,
	linux-rdma <linux-rdma@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] Please pull RDMA subsystem changes
Date: Fri, 17 Aug 2018 13:27:02 -0700	[thread overview]
Message-ID: <CA+55aFzcp=a2sNOVR7DTEY9dehYamXaJ1bpSfF0FZir_9MhsVg@mail.gmail.com> (raw)
In-Reply-To: <20180817201535.GI28676@mellanox.com>

On Fri, Aug 17, 2018 at 1:15 PM Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> We often have merge conflicts with RDMA, how do you prefer to get the
> PR? I'm actually not very clear on this part of the process.

I  generally prefer the non-merged version, but with comments about
the conflicts.

In fact, the really preferred model is generally to send me a
non-merged pull request (say "tags/for-linus") but if the conflicts
look even half-way nasty - or simply because you did the merge anyway
just to get the proper diffstat because history is complex - mention
that you have a merged branch for verification (say
"branch/for-linus-merged").

When I get that kind of pull request, I'll just do the merge
resolution myself, and after I've done it I'll generally then do

   git checkout -b test-merge
   git pull <repoaddress> for-linus-merged

and then just compare the end result with my resolution as an extra
verification step.

I may end up skipping the verification step if everything looks
entirely trivial (and really, if you have no real reason for the
pre-merged branch, don't bother even mentioning it even if you did it
for the diffstat), but in practice whenever somebody does that, I have
no reason not to just do that simple extra verification.

Most of the time the merges are exactly the same, possibly with
whitespace or trivial ordering differences (things like Makefiles and
Kconfig files often have add-add conflicts where the ordering really
doesn't matter between two config options).

And then sometimes it shows that I missed something in my mmerge.

And sometimes it shows that  I do so many merges that I actually ended
up noticing something that the submaintainer didn't.

So it can be uninteresting, and when it isn't uninteresting it can go
either way, but so far for the people who do this, I've never been in
the situation where I was *sorry* for the double merge and extra
verification step.

Because when mis-merges happen (they are happily pretty rare) they are
_so_ annoying and can be so hard to figure out later, that I'd rather
spend a bit more time on the merge than have a dodgy one.

               Linus

  reply	other threads:[~2018-08-17 20:27 UTC|newest]

Thread overview: 184+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-16 21:57 Jason Gunthorpe
2018-08-17 19:31 ` Linus Torvalds
2018-08-17 19:44   ` Linus Torvalds
2018-08-17 20:50     ` Linus Torvalds
2018-08-17 21:16       ` Jason Gunthorpe
2018-08-17 23:56         ` Linus Torvalds
2018-08-17 20:15   ` Jason Gunthorpe
2018-08-17 20:27     ` Linus Torvalds [this message]
2018-08-17 21:27       ` Jason Gunthorpe
  -- strict thread matches above, loose matches on Subject: below --
2022-01-13 18:53 Jason Gunthorpe
2022-01-13 19:19 ` pr-tracker-bot
2022-01-07  1:15 Jason Gunthorpe
2022-01-07  3:05 ` pr-tracker-bot
2021-12-21  1:25 Jason Gunthorpe
2021-12-21  1:37 ` pr-tracker-bot
2021-12-09 21:07 Jason Gunthorpe
2021-12-09 21:23 ` pr-tracker-bot
2021-11-19 17:19 Jason Gunthorpe
2021-11-19 19:46 ` pr-tracker-bot
2021-11-03 13:43 Jason Gunthorpe
2021-11-03 16:01 ` pr-tracker-bot
2021-10-27 12:49 Jason Gunthorpe
2021-10-27 17:44 ` pr-tracker-bot
2021-09-30  1:02 Jason Gunthorpe
2021-09-30 21:34 ` pr-tracker-bot
2021-09-08 23:40 Jason Gunthorpe
2021-09-09 18:54 ` pr-tracker-bot
2021-09-01 23:41 Jason Gunthorpe
2021-09-02 22:42 ` pr-tracker-bot
2021-08-24 14:23 Jason Gunthorpe
2021-08-24 17:01 ` pr-tracker-bot
2021-08-06 13:30 Jason Gunthorpe
2021-08-06 18:27 ` pr-tracker-bot
2021-07-26 23:10 Jason Gunthorpe
2021-07-27 21:17 ` pr-tracker-bot
2021-07-01  1:30 Jason Gunthorpe
2021-07-01 21:58 ` pr-tracker-bot
2021-06-10 12:37 Jason Gunthorpe
2021-06-10 19:18 ` pr-tracker-bot
2021-05-20 14:37 Jason Gunthorpe
2021-05-20 16:47 ` pr-tracker-bot
2021-04-30 16:55 Jason Gunthorpe
2021-04-30 17:01 ` Jason Gunthorpe
2021-05-01 17:20 ` pr-tracker-bot
2021-04-08 19:51 Jason Gunthorpe
2021-04-08 23:40 ` pr-tracker-bot
2021-03-25 18:04 Jason Gunthorpe
2021-03-25 19:13 ` pr-tracker-bot
2021-03-05 23:35 Jason Gunthorpe
2021-03-06  1:35 ` pr-tracker-bot
2021-02-22 14:59 Jason Gunthorpe
2021-02-22 18:37 ` pr-tracker-bot
2021-01-28 14:46 Jason Gunthorpe
2021-01-15 19:21 Jason Gunthorpe
2021-01-15 23:35 ` pr-tracker-bot
2020-12-16 17:57 Jason Gunthorpe
2020-12-16 21:51 ` pr-tracker-bot
2020-12-10 15:50 Jason Gunthorpe
2020-12-10 19:11 ` pr-tracker-bot
2020-11-27 14:00 Jason Gunthorpe
2020-11-27 21:21 ` pr-tracker-bot
2020-11-19 19:29 Jason Gunthorpe
2020-11-19 23:00 ` pr-tracker-bot
2020-11-05 18:16 Jason Gunthorpe
2020-11-05 20:21 ` pr-tracker-bot
2020-10-29 18:41 Jason Gunthorpe
2020-10-29 18:53 ` Linus Torvalds
2020-10-29 19:00 ` pr-tracker-bot
2020-10-16 18:51 Jason Gunthorpe
2020-10-17 18:21 ` Linus Torvalds
2020-10-17 18:42   ` Jason Gunthorpe
2020-10-17 18:22 ` pr-tracker-bot
2020-09-25 12:57 Jason Gunthorpe
2020-09-25 17:48 ` pr-tracker-bot
2020-09-10 23:38 Jason Gunthorpe
2020-09-11 18:37 ` pr-tracker-bot
2020-08-21 14:06 Jason Gunthorpe
2020-08-21 17:16 ` pr-tracker-bot
2020-08-06 18:27 Jason Gunthorpe
2020-08-07  1:55 ` pr-tracker-bot
2020-07-31 15:17 Jason Gunthorpe
2020-07-31 16:45 ` pr-tracker-bot
2020-07-24 17:47 Jason Gunthorpe
2020-07-24 21:40 ` pr-tracker-bot
2020-07-10 17:58 Jason Gunthorpe
2020-07-10 22:10 ` pr-tracker-bot
2020-06-25 17:56 Jason Gunthorpe
2020-06-25 20:15 ` pr-tracker-bot
2020-06-04 19:51 Jason Gunthorpe
2020-06-05 21:15 ` pr-tracker-bot
2020-05-29 14:15 Jason Gunthorpe
2020-05-29 21:10 ` pr-tracker-bot
2020-05-15 19:13 Jason Gunthorpe
2020-05-15 20:15 ` pr-tracker-bot
2020-04-28 19:59 Jason Gunthorpe
2020-04-28 20:40 ` pr-tracker-bot
2020-04-01 23:01 Jason Gunthorpe
2020-04-02  2:05 ` pr-tracker-bot
2020-03-26 17:31 Jason Gunthorpe
2020-03-26 17:50 ` pr-tracker-bot
2020-03-08  0:07 Jason Gunthorpe
2020-03-08  2:00 ` pr-tracker-bot
2020-02-15 21:32 Jason Gunthorpe
2020-02-16  1:20 ` pr-tracker-bot
2020-01-31 15:16 Jason Gunthorpe
2020-01-31 23:10 ` pr-tracker-bot
2020-01-10  2:16 Jason Gunthorpe
2020-01-11 14:45 ` pr-tracker-bot
2019-11-27  0:24 Jason Gunthorpe
2019-11-27 18:19 ` Linus Torvalds
2019-11-27 19:23   ` Jason Gunthorpe
2019-11-27 18:45 ` pr-tracker-bot
2019-11-14 15:16 Jason Gunthorpe
2019-11-14 16:55 ` pr-tracker-bot
2019-10-31 18:22 Jason Gunthorpe
2019-11-01 17:10 ` pr-tracker-bot
2019-10-09 14:28 Jason Gunthorpe
2019-10-09 19:30 ` pr-tracker-bot
2019-09-19 16:34 Jason Gunthorpe
2019-09-21 17:40 ` pr-tracker-bot
2019-07-30 12:15 Jason Gunthorpe
2019-07-30 20:40 ` pr-tracker-bot
2019-07-15 15:26 Jason Gunthorpe
2019-07-16  4:35 ` pr-tracker-bot
2019-06-06 20:14 Jason Gunthorpe
2019-06-07 16:45 ` pr-tracker-bot
2019-05-15  0:46 Jason Gunthorpe
2019-05-15  4:05 ` pr-tracker-bot
2019-05-09 13:37 Jason Gunthorpe
2019-05-09 16:25 ` pr-tracker-bot
2019-04-28 11:52 Jason Gunthorpe
2019-04-28 16:59 ` Linus Torvalds
2019-04-28 23:49   ` Jason Gunthorpe
2019-04-29  0:09     ` Linus Torvalds
2019-04-30 12:53       ` Jason Gunthorpe
2019-04-28 18:05 ` pr-tracker-bot
2019-04-29  6:09 ` Heiko Carstens
2019-04-29  8:40   ` Jason Gunthorpe
2019-04-29  9:00     ` Michal Kubecek
2019-04-29  9:19       ` Leon Romanovsky
2019-04-29 15:42     ` Doug Ledford
2019-04-29 16:29       ` Doug Ledford
2019-04-10 18:46 Jason Gunthorpe
2019-04-10 19:55 ` pr-tracker-bot
2019-03-18  1:04 Jason Gunthorpe
2019-03-19 18:15 ` pr-tracker-bot
2019-03-07  1:34 Jason Gunthorpe
2019-03-10  1:40 ` pr-tracker-bot
2019-02-21 23:07 Jason Gunthorpe
2019-02-22 18:40 ` pr-tracker-bot
2019-02-01 17:41 Jason Gunthorpe
2019-02-01 18:45 ` pr-tracker-bot
2019-01-18  3:56 Jason Gunthorpe
2019-01-18  5:35 ` pr-tracker-bot
2019-01-04  5:00 Jason Gunthorpe
2019-01-06  2:40 ` pr-tracker-bot
2018-12-24 22:16 Jason Gunthorpe
2018-12-29  1:30 ` pr-tracker-bot
2018-11-29 22:52 Jason Gunthorpe
2018-10-25 21:21 Jason Gunthorpe
2018-10-26 14:50 ` Linus Torvalds
2018-09-27 18:24 Jason Gunthorpe
2018-09-27 20:17 ` Greg Kroah-Hartman
2018-09-10 23:04 Jason Gunthorpe
2018-08-22 21:44 Jason Gunthorpe
2018-08-03 16:11 Jason Gunthorpe
2018-07-13 17:13 Jason Gunthorpe
2018-06-20 21:00 Jason Gunthorpe
2018-06-06 21:42 Jason Gunthorpe
2018-06-01 16:47 Jason Gunthorpe
2018-05-24 20:51 Jason Gunthorpe
2018-04-06 16:05 Jason Gunthorpe
2018-05-16 17:39 ` Eugene Syromiatnikov
2018-05-16 17:49   ` Jason Gunthorpe
2018-05-16 18:01     ` Eugene Syromiatnikov
2018-03-29 19:17 Jason Gunthorpe
2018-03-20 23:17 Jason Gunthorpe
2018-01-31 17:47 Jason Gunthorpe
     [not found] ` <20180131174735.GA18568-uk2M96/98Pc@public.gmane.org>
2018-01-31 20:11   ` Linus Torvalds
     [not found]     ` <CA+55aFxmnW-iu1Na3QC8Ci8Q_Qdfn2Ak_9wDB6+A564R=Xn9Ag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-01-31 21:04       ` Jason Gunthorpe
     [not found]         ` <20180131210457.GE23352-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2018-02-01 19:12           ` Linus Torvalds
     [not found]             ` <CA+55aFxySLoCHcmZgx2PiF6jEazVOSy=2idccRsWqOzmyK2gaw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-01 20:33               ` Jason Gunthorpe
2017-12-28 21:03 Jason Gunthorpe
2017-12-16 17:12 Jason Gunthorpe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CA+55aFzcp=a2sNOVR7DTEY9dehYamXaJ1bpSfF0FZir_9MhsVg@mail.gmail.com' \
    --to=torvalds@linux-foundation.org \
    --cc=dledford@redhat.com \
    --cc=jgg@mellanox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --subject='Re: [GIT PULL] Please pull RDMA subsystem changes' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).