linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
To: Jason Gunthorpe <jgg-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Cc: Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
	linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [GIT PULL] Please pull RDMA subsystem changes
Date: Thu, 1 Feb 2018 11:12:43 -0800	[thread overview]
Message-ID: <CA+55aFxySLoCHcmZgx2PiF6jEazVOSy=2idccRsWqOzmyK2gaw@mail.gmail.com> (raw)
In-Reply-To: <20180131210457.GE23352-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>

On Wed, Jan 31, 2018 at 1:04 PM, Jason Gunthorpe <jgg-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org> wrote:
>
> On the topic of back merges, can you give some guidance?
>
> With some success, we've encouraged all the driver vendors to test -rc
> kernels and test our RDMA for-next internally during the entire -rc
> cycle. Most of the testers are taking RDMA for-next and merging it
> with latest -rcX then testing the result.
>
> Due to the conflict above our tree was left with complicated merge
> conflicts for about 3-4 weeks, and some of the testers have had pain
> due to this.
>
> Would back merging -rcX ealier, with a similar but better merge
> commit, be an acceptable practice?

I'd hesitate to say "sure" in general.

For pure testing of temporary kernels that aren't actually in any way
upstream anyway, is there any reason why you can't just have a
separate kernel with the merges in place, but not make them part of
your development tree? Think of how "linux-next" works on a big scale:
there's tons of random merges there exactly so that people can test
the end result, but those merges are understood to be temporary and
not part of the development trees themselves.

So back-merges are not necessarily evil, and they _can_ be done well.
But I don't actually see your case as being a reason for them in
general.

                Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2018-02-01 19:12 UTC|newest]

Thread overview: 256+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-31 17:47 [GIT PULL] Please pull RDMA subsystem changes 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 [this message]
     [not found]             ` <CA+55aFxySLoCHcmZgx2PiF6jEazVOSy=2idccRsWqOzmyK2gaw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-01 20:33               ` Jason Gunthorpe
  -- strict thread matches above, loose matches on Subject: below --
2024-03-18 16:51 Jason Gunthorpe
2024-03-18 22:47 ` pr-tracker-bot
2024-02-21  0:12 Jason Gunthorpe
2024-02-21  1:03 ` pr-tracker-bot
2024-01-12  1:06 Jason Gunthorpe
2024-01-12 22:20 ` pr-tracker-bot
2023-12-08 14:19 Jason Gunthorpe
2023-12-08 20:45 ` pr-tracker-bot
2023-11-02 23:09 Jason Gunthorpe
2023-11-03  1:26 ` pr-tracker-bot
2023-10-06 18:30 Jason Gunthorpe
2023-10-07 18:12 ` pr-tracker-bot
2023-09-01  0:30 Jason Gunthorpe
2023-09-02  0:00 ` pr-tracker-bot
2023-08-11 23:55 Jason Gunthorpe
2023-08-12  2:55 ` pr-tracker-bot
2023-07-28 18:52 Jason Gunthorpe
2023-07-29  0:27 ` pr-tracker-bot
2023-06-29  0:46 Jason Gunthorpe
2023-06-30  4:10 ` Linus Torvalds
2023-07-03 21:19   ` Jason Gunthorpe
2023-06-30  4:16 ` pr-tracker-bot
2023-06-15 12:39 Jason Gunthorpe
2023-06-16  4:16 ` pr-tracker-bot
2023-05-31 16:58 Jason Gunthorpe
2023-04-28 15:34 Jason Gunthorpe
2023-04-30  0:52 ` pr-tracker-bot
2023-04-14 12:18 Jason Gunthorpe
2023-04-14 17:40 ` pr-tracker-bot
2023-02-24  1:27 Jason Gunthorpe
2023-02-24 23:27 ` pr-tracker-bot
2023-02-10  0:35 Jason Gunthorpe
2023-02-10  1:56 ` pr-tracker-bot
2023-01-20 21:13 Jason Gunthorpe
2023-01-20 22:38 ` pr-tracker-bot
2023-01-07  2:11 Jason Gunthorpe
2023-01-07 18:43 ` pr-tracker-bot
2022-12-17  1:05 Jason Gunthorpe
2022-12-17 14:28 ` pr-tracker-bot
2022-12-13 21:05 Jason Gunthorpe
2022-12-14  2:23 ` Yanjun Zhu
2022-12-14  7:40   ` Leon Romanovsky
2022-12-15  2:18     ` Yanjun Zhu
2022-12-14 18:04 ` pr-tracker-bot
2022-11-02 12:26 Jason Gunthorpe
2022-11-02 18:38 ` pr-tracker-bot
2022-10-06 23:03 Jason Gunthorpe
2022-10-07 19:20 ` pr-tracker-bot
2022-09-09 16:17 Jason Gunthorpe
2022-09-09 19:13 ` pr-tracker-bot
2022-08-19 18:21 Jason Gunthorpe
2022-08-20 17:55 ` pr-tracker-bot
2022-08-04 18:48 Jason Gunthorpe
2022-08-05  3:26 ` pr-tracker-bot
2022-07-18 23:12 Jason Gunthorpe
2022-07-19  0:19 ` pr-tracker-bot
2022-06-30 12:57 Jason Gunthorpe
2022-06-30 17:28 ` pr-tracker-bot
2022-05-26 14:46 Jason Gunthorpe
2022-05-27  4:17 ` pr-tracker-bot
2022-05-06 16:01 Jason Gunthorpe
2022-05-06 16:57 ` Linus Torvalds
2022-05-06 17:06   ` Jason Gunthorpe
2022-05-06 16:58 ` pr-tracker-bot
2022-04-08 19:03 Jason Gunthorpe
2022-04-09  4:39 ` pr-tracker-bot
2022-03-23 19:54 Jason Gunthorpe
2022-03-25  2:47 ` pr-tracker-bot
2022-02-25 21:16 Jason Gunthorpe
2022-02-25 22:15 ` pr-tracker-bot
2022-02-04 23:59 Jason Gunthorpe
2022-02-05  0:31 ` pr-tracker-bot
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-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
2018-08-17 21:27       ` 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
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+55aFxySLoCHcmZgx2PiF6jEazVOSy=2idccRsWqOzmyK2gaw@mail.gmail.com' \
    --to=torvalds-de/tnxtf+jlsfhdxvbkv3wd2fqjk+8+b@public.gmane.org \
    --cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=jgg-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).