From: Leon Romanovsky <leon@kernel•org>
To: Doug Ledford <dledford@redhat•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Daniel Jurgens <danielj@mellanox•com>,
Paul Moore <paul@paul-moore•com>,
Parav Pandit <parav@mellanox•com>, Eli Cohen <eli@mellanox•com>
Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree
Date: Fri, 14 Jul 2017 18:10:50 +0300 [thread overview]
Message-ID: <20170714151050.GB1528@mtr-leonro.local> (raw)
In-Reply-To: <1500042834.2936.18.camel@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 979 bytes --]
On Fri, Jul 14, 2017 at 10:33:54AM -0400, Doug Ledford wrote:
> So, you need to take your pick. Do you want continuous development, or
> do you want me bending over backwards to try and avoid your company's
> endless stream of conflicts so Linus isn't yelling about that?
Doug,
You are mixing my warning of merge conflict in mlx4 code, which we never
prepared for shared code and whole Mellanox submissions (IPoIB, mlx5,
core, e.t.c).
To make long story short, if you can assure that public branches will be
updated in WEEKLY manner, I'll do everything internally FOR ALL RDMA
related stuff (and not mlx5 only) to avoid merge conflicts, and you will
get clean and ready apply topics exactly as DaveM receiving,
It works pretty well for rdma-core, once the discussion is stopped,
we are checking go/no-go and applying or asking to resubmit. For very
major changes, the delay is a little bit longer.
So yes, I prefer truly continuous development over unclear future.
Thanks
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-07-14 15:10 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-14 1:14 linux-next: manual merge of the rdma tree with Linus' tree Stephen Rothwell
2017-07-14 1:17 ` Doug Ledford
2017-07-14 3:34 ` Leon Romanovsky
2017-07-14 3:50 ` Stephen Rothwell
2017-07-14 4:55 ` Leon Romanovsky
2017-07-14 12:03 ` Doug Ledford
2017-07-14 13:46 ` Leon Romanovsky
2017-07-14 4:12 ` Doug Ledford
2017-07-14 4:54 ` Leon Romanovsky
2017-07-14 14:33 ` Doug Ledford
2017-07-14 15:10 ` Leon Romanovsky [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-11 2:23 Stephen Rothwell
2025-09-11 11:03 ` Leon Romanovsky
2025-05-14 2:24 Stephen Rothwell
2025-05-14 8:17 ` Leon Romanovsky
2025-04-22 4:30 Stephen Rothwell
2025-03-20 1:08 Stephen Rothwell
2025-03-20 6:35 ` Leon Romanovsky
2025-01-06 0:13 Stephen Rothwell
2025-01-14 20:48 ` Jason Gunthorpe
2025-01-14 21:27 ` Stephen Rothwell
2025-01-15 0:41 ` Jason Gunthorpe
2025-01-15 1:07 ` Stephen Rothwell
2025-01-15 11:17 ` Bernard Metzler
2025-01-05 23:51 Stephen Rothwell
2025-01-06 1:02 ` Stephen Rothwell
2025-01-06 14:16 ` Zhu Yanjun
2023-06-22 1:52 Stephen Rothwell
2021-05-21 0:34 Stephen Rothwell
2021-04-15 2:05 Stephen Rothwell
2021-02-10 2:15 Stephen Rothwell
2021-02-10 18:57 ` Pearson, Robert B
2021-02-10 20:36 ` Jason Gunthorpe
2021-02-10 22:08 ` Pearson, Robert B
2021-02-11 20:03 ` Martin Wilck
2019-11-05 1:17 Stephen Rothwell
2019-11-05 2:21 ` Jason Gunthorpe
2019-11-05 2:28 ` Stephen Rothwell
2019-10-24 0:01 Stephen Rothwell
2019-10-28 19:30 ` Jason Gunthorpe
2019-06-20 2:10 Stephen Rothwell
2019-06-20 3:25 ` Doug Ledford
2019-06-20 2:06 Stephen Rothwell
2019-06-20 3:24 ` Doug Ledford
2019-06-14 3:00 Stephen Rothwell
2019-06-14 13:11 ` Doug Ledford
2018-09-28 0:01 Stephen Rothwell
2018-09-29 2:57 ` Parav Pandit
2018-08-06 2:01 Stephen Rothwell
2018-08-06 19:41 ` Jason Gunthorpe
2018-08-06 21:49 ` Stephen Rothwell
2017-08-08 2:11 Stephen Rothwell
2016-12-15 0:47 Stephen Rothwell
2016-10-10 0:59 Stephen Rothwell
2016-10-10 0:54 Stephen Rothwell
2016-08-05 1:05 Stephen Rothwell
2016-08-05 1:01 Stephen Rothwell
2016-08-05 0:52 Stephen Rothwell
2016-05-19 1:45 Stephen Rothwell
2016-03-22 0:33 Stephen Rothwell
2016-03-22 0:29 Stephen Rothwell
2016-03-22 0:24 Stephen Rothwell
2016-03-22 0:17 Stephen Rothwell
2015-11-01 7:48 Stephen Rothwell
2015-11-02 10:40 ` Sagi Grimberg
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=20170714151050.GB1528@mtr-leonro.local \
--to=leon@kernel$(echo .)org \
--cc=danielj@mellanox$(echo .)com \
--cc=dledford@redhat$(echo .)com \
--cc=eli@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=parav@mellanox$(echo .)com \
--cc=paul@paul-moore$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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