From: Nicolas Ferre <nicolas.ferre@atmel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: dedekind1@gmail•com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org,
Dmitry Eremin-Solenikov <dbaryshkov@gmail•com>,
Nico Erfurth <ne@erfurth•eu>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>,
Russell King - ARM Linux <linux@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the at91 tree
Date: Fri, 09 Sep 2011 11:53:35 +0200 [thread overview]
Message-ID: <4E69E21F.5070701@atmel.com> (raw)
In-Reply-To: <20110909164539.bae897109d3de0e67f0db69a@canb.auug.org.au>
Le 09/09/2011 08:45, Stephen Rothwell :
> Hi Artem,
>
> On Fri, 09 Sep 2011 09:45:28 +0300 Artem Bityutskiy
> <dedekind1@gmail•com> wrote:
>>
>> OK, thanks, I guess you'll carry this modification so far, we'll
>> need to take care of the conflict when merging.
>
> Yep, no worries.
Stephen,
I have seen the two manual merges that you made concerning our
at91-next tree. This is when we realize how linux-next is a great tool ;-)
So, as I am not so used to this kind of situation, I wonder if I need
to included those two patches from Russell's and Artem's git trees in
our at91-next one or if I only carry on with current patch series
until Linus merges all this himself?
Best regards,
--
Nicolas Ferre
next prev parent reply other threads:[~2011-09-09 9:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 3:29 linux-next: manual merge of the l2-mtd tree with the at91 tree Stephen Rothwell
2011-09-09 6:45 ` Artem Bityutskiy
2011-09-09 6:45 ` Stephen Rothwell
2011-09-09 9:53 ` Nicolas Ferre [this message]
2011-09-09 10:27 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-09-22 5:36 Stephen Rothwell
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=4E69E21F.5070701@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=dbaryshkov@gmail$(echo .)com \
--cc=dedekind1@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=ne@erfurth$(echo .)eu \
--cc=plagnioj@jcrosoft$(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