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

Groups > linux.kernel > #1687055

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

From Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups linux.kernel
Subject Re: linux-next: manual merge of the rdma tree with Linus' tree
Date 2017-07-14 06:00 +0200
Message-ID <u2ZVM-69C-11@gated-at.bofh.it> (permalink)
References <u2XqV-4Gq-5@gated-at.bofh.it> <u2XqV-4Gq-3@gated-at.bofh.it> <u2ZCp-63d-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Hi all,

On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky <leon@kernel.org> wrote:
>
> Sorry Doug, but it is not expected at all for the code which will go to 4.14.
> 
> Both patches in question were targeted for 4.13 and you was expected to
> see the merge conflicts during last month or so, prior to merge window of 4.13.
> 
> In 4.14, you should base your tree on Linus's tree and don't have ANY
> conflicts in your subsystem, between ANY subsystems and especially
> Linus, so we will be able to develop and test.
> 
> For me, this merge conflict puts a large sign, that your tree is not ready for 4.14.
> 
> Please base your tree on Linus's tree.

And if these commits are destined for v4.14, then they should not have
been in linux-next yet.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Previous in thread | Next 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