From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Lunn <andrew@lunn•ch>
Cc: Linus Torvalds <torvalds@linux-foundation•org>,
Doug Ledford <dledford@redhat•com>,
David Miller <davem@davemloft•net>,
Network Development <netdev@vger•kernel.org>,
linux-next <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Amir Vadai <amir@vadai•me>, Maor Gottlieb <maorg@mellanox•com>
Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree
Date: Thu, 17 Mar 2016 09:35:31 +1100 [thread overview]
Message-ID: <20160317093531.4894f078@canb.auug.org.au> (raw)
In-Reply-To: <20160316211503.GA16382@lunn.ch>
Hi Andrew,
On Wed, 16 Mar 2016 22:15:03 +0100 Andrew Lunn <andrew@lunn•ch> 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
>
> Only the second want is required.
>
> > consider cooperate with the maintainer of the conflicting tree to
>
> cooperating
Thanks. Breakfast is not the best time to compose prose :-)
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-03-16 22:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-16 0:58 linux-next: manual merge of the rdma tree with the net-next tree Stephen Rothwell
2016-03-16 14:27 ` Maor Gottlieb
2016-03-16 17:18 ` Linus Torvalds
2016-03-16 17:35 ` Doug Ledford
2016-03-16 17:44 ` Linus Torvalds
2016-03-23 23:04 ` Or Gerlitz
2016-03-23 23:23 ` Linus Torvalds
2016-03-16 20:52 ` Stephen Rothwell
2016-03-16 21:01 ` Linus Torvalds
2016-03-16 21:15 ` Andrew Lunn
2016-03-16 22:35 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-01-05 1:51 Stephen Rothwell
2016-01-05 17:05 ` Or Gerlitz
2016-01-05 20:51 ` Stephen Rothwell
2015-08-28 1:26 Stephen Rothwell
2015-08-28 6:35 ` Jiri Pirko
2015-06-17 3:20 Michael Ellerman
2015-06-15 8:12 Michael Ellerman
2015-06-15 8:11 Michael Ellerman
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=20160317093531.4894f078@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amir@vadai$(echo .)me \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=dledford@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maorg@mellanox$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
/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