From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
Chris Ball <cjb@laptop.org>,
ludovic.desroches@atmel.com
Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] mmc: at91-mci: remove driver
Date: Tue, 30 Oct 2012 18:08:59 +0100 [thread overview]
Message-ID: <509009AB.8040302@atmel.com> (raw)
In-Reply-To: <20121030154309.GD19021@game.jcrosoft.org>
On 10/30/2012 04:43 PM, Jean-Christophe PLAGNIOL-VILLARD :
> On 11:38 Tue 30 Oct , Chris Ball wrote:
>> Hi,
>>
>> On Tue, Oct 30 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
>>> On 11:09 Tue 30 Oct , Chris Ball wrote:
>>>> Hi,
>>>>
>>>> On Tue, Oct 30 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
>>>>>> Thanks! Pushed to mmc-next for 3.8.
>>>>>
>>>>> if you don't mind I prefer to take it via at91
>>>>>
>>>>> I've a patch series that cleanup the platform_data it's difficult to merge
>>>>> with this one
>>>>
>>>> Hm, I don't understand why it should be difficult to merge. Is it
>>>> because this patch modifies arch/arm/mach-at91/include/mach/board.h?
>>>>
>>>> If so, sounds like we should just take that change out of this patch
>>>> and have it go into your platform data cleanup patch, and then I can
>>>> merge the drivers/mmc change independently? Let me know what you think.
>>> I'm modifing and moiving the board.h so this file will not exist anymore
>>>
>>> and the platform data are not anymore in arch/arm/mach-at91/include/mach/board.h
>>
>> Can we take the modification of board.h out of this patch, then,
>> leaving just the drivers/mmc/ changes?
> If you really insist but for changelog history and bisectable I'll prefer to
> do not do so
Why don't we leave the code already submitted in the mmc tree. It seems
that the conflict can be pretty easily handled in advance as it ends up
being a file removal...
So, I would not bother Chris with our own business and would just manage
the conflict later, in linux-next (maybe sending a little note to Stephen).
My $0.02.
Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2012-10-30 16:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-29 14:27 [PATCH] mmc: at91-mci: remove driver ludovic.desroches
2012-10-29 14:45 ` Chris Ball
2012-10-30 15:01 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-30 15:09 ` Chris Ball
2012-10-30 15:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-30 15:38 ` Chris Ball
2012-10-30 15:43 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-30 17:08 ` Nicolas Ferre [this message]
2012-10-30 15:44 ` ludovic.desroches
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=509009AB.8040302@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=cjb@laptop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ludovic.desroches@atmel.com \
--cc=plagnioj@jcrosoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).