Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1359365
| From | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the rdma tree with the net-next tree |
| Date | 2016-03-16 22:10 +0100 |
| Message-ID | <rdqRB-66V-19@gated-at.bofh.it> (permalink) |
| References | <rd7YC-1nQ-5@gated-at.bofh.it> <rdnh0-3tX-1@gated-at.bofh.it> <rdqHT-5Ja-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Wed, Mar 16, 2016 at 1:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> How about "This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may want also want to
> consider cooperate with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts."
Yup, sounds fine.
Maybe you could even say "don't merge this to hide the problem",
because that has been another reaction in the past, but the above
already sounds pretty good.
Linus
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the rdma tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-16 02:00 +0100
Re: linux-next: manual merge of the rdma tree with the net-next tree Maor Gottlieb <maor.linux@gmail.com> - 2016-03-16 15:30 +0100
Re: linux-next: manual merge of the rdma tree with the net-next tree Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-16 18:20 +0100
Re: linux-next: manual merge of the rdma tree with the net-next tree Doug Ledford <dledford@redhat.com> - 2016-03-16 18:40 +0100
Re: linux-next: manual merge of the rdma tree with the net-next tree Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-16 18:50 +0100
Re: linux-next: manual merge of the rdma tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-16 22:00 +0100
Re: linux-next: manual merge of the rdma tree with the net-next tree Linus Torvalds <torvalds@linux-foundation.org> - 2016-03-16 22:10 +0100
Re: linux-next: manual merge of the rdma tree with the net-next tree Andrew Lunn <andrew@lunn.ch> - 2016-03-16 22:20 +0100
Re: linux-next: manual merge of the rdma tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-16 23:40 +0100
csiph-web