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

From	Leon Romanovsky <leon@kernel.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the rdma tree with Linus' tree
Date	2017-07-14 17:20 +0200
Message-ID	<u3axQ-5e2-17@gated-at.bofh.it> (permalink)
References	(1 earlier) <u2XqV-4Gq-3@gated-at.bofh.it> <u2ZCp-63d-3@gated-at.bofh.it> <u30f7-6xU-3@gated-at.bofh.it> <u30RQ-6T0-9@gated-at.bofh.it> <u39V7-4Hr-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

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

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

Thread

Re: linux-next: manual merge of the rdma tree with Linus' tree Doug Ledford <dledford@redhat.com> - 2017-07-14 03:20 +0200
  Re: linux-next: manual merge of the rdma tree with Linus' tree Leon Romanovsky <leon@kernel.org> - 2017-07-14 05:40 +0200
    Re: linux-next: manual merge of the rdma tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-14 06:00 +0200
      Re: linux-next: manual merge of the rdma tree with Linus' tree Leon Romanovsky <leon@kernel.org> - 2017-07-14 07:00 +0200
        Re: linux-next: manual merge of the rdma tree with Linus' tree Doug Ledford <dledford@redhat.com> - 2017-07-14 14:10 +0200
          Re: linux-next: manual merge of the rdma tree with Linus' tree Leon Romanovsky <leon@kernel.org> - 2017-07-14 15:50 +0200
    Re: linux-next: manual merge of the rdma tree with Linus' tree Doug Ledford <dledford@redhat.com> - 2017-07-14 06:20 +0200
      Re: linux-next: manual merge of the rdma tree with Linus' tree Leon Romanovsky <leon@kernel.org> - 2017-07-14 07:00 +0200
        Re: linux-next: manual merge of the rdma tree with Linus' tree Doug Ledford <dledford@redhat.com> - 2017-07-14 16:40 +0200
          Re: linux-next: manual merge of the rdma tree with Linus' tree Leon Romanovsky <leon@kernel.org> - 2017-07-14 17:20 +0200

csiph-web