From: Samuel Ortiz <sameo@linux.intel.com>
To: Chris Ball <cjb@laptop.org>
Cc: wwang <wei_wang@realsil.com.cn>,
"devel@linuxdriverproject.org" <devel@linuxdriverproject.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
"arnd@arndb.de" <arnd@arndb.de>,
"oakad@yahoo.com" <oakad@yahoo.com>,
"bp@alien8.de" <bp@alien8.de>
Subject: Re: [PATCH v7 0/3] Add modules to support realtek PCIE card reader
Date: Mon, 12 Nov 2012 00:51:52 +0100 [thread overview]
Message-ID: <20121111235152.GH27828@sortiz-mobl> (raw)
In-Reply-To: <87mwyqrdrb.fsf@octavius.laptop.org>
Hi Chris,
On Fri, Nov 09, 2012 at 10:34:48AM -0500, Chris Ball wrote:
> Hi,
>
> On Fri, Nov 09 2012, wwang wrote:
> > I have noticed that the file rtsx_pci_sdmmc.c in your mmc-next branch
> > is still v6 patch. In v7 patch, this MMC part has also been modified
> > to comply with my MFD portion. So please update to this version.
> >
> > And one more question. Samuel have merged all of my patch set in his
> > for-next branch, including the MMC part. I don't know whether this
> > will conflict with your tree in the next merge.
> >
> > Hi Samuel:
> >
> > Since the whole patch set has been merged in your for-next branch,
> > does it mean that you will help to merge all of the three parts to
> > linus's tree?
>
> I've removed the patch from my tree to avoid conflicting with Samuel.
> I'm happy to either have the MMC patch go through the MFD tree with:
>
> Acked-by: Chris Ball <cjb@laptop.org>
>
> or to merge the MMC side of v7 myself, whichever Samuel prefers.
I'm taking the patch through my tree, thanks for the ACK.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
next prev parent reply other threads:[~2012-11-11 23:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-29 5:49 [PATCH v7 0/3] Add modules to support realtek PCIE card reader wei_wang
2012-10-29 5:49 ` [PATCH v7 1/3] drivers/mfd: Add realtek pcie card reader driver wei_wang
2012-10-29 5:49 ` [PATCH v7 2/3] drivers/mmc: Add realtek pcie sdmmc host driver wei_wang
2012-10-29 5:49 ` [PATCH v7 3/3] drivers/memstick: Add realtek pcie memstick " wei_wang
2012-10-30 3:33 ` [PATCH v7 0/3] Add modules to support realtek PCIE card reader wwang
2012-11-07 19:41 ` Chris Ball
2012-11-08 2:58 ` wwang
2012-11-08 4:01 ` Alex Dubov
2012-11-08 5:30 ` wwang
2012-11-08 12:34 ` [PATCH v7 0/3] Add modules to support realtek PCIE card reade Arnd Bergmann
2012-11-08 13:20 ` [PATCH v7 0/3] Add modules to support realtek PCIE card reader gregkh
2012-11-09 15:07 ` wwang
2012-11-09 15:34 ` Chris Ball
2012-11-11 23:51 ` Samuel Ortiz [this message]
2012-11-08 9:41 ` Samuel Ortiz
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=20121111235152.GH27828@sortiz-mobl \
--to=sameo@linux.intel.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=cjb@laptop.org \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=oakad@yahoo.com \
--cc=wei_wang@realsil.com.cn \
/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