Re: [PATCH 1/2] mmc: rtsx: Revert "mmc: rtsx: modify errorhandleandremovesmatch warnings"

[micky]

Hi Ulf

On 05/08/2014 04:22 PM, Ulf Hansson wrote:
> On 8 May 2014 09:55, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
> > > It seems Chris is too busy to responding, so would you help to pick
> > > this patch for 3.15 fix.
> > Hmmmm... that's pretty bad timing.  I've literally just sent the
> > pull-request containing the MFD/MMC fixup branch to Linus.  I guess
> > Ulf will have to do it.
> There seem to be some confusion here. :-)
>
> This patch is _only_ intended for Chris' mmc_next branch, so it
> shouldn't go for 3.15 fixes. Or better, Chris should drop the patch
> this one is reverting.
Sorry for the mistake, only the second patch of the patch set is need 
for 3.15 fix.
I wrote this email in a wrong place.

Best Regards.
> Likely we will see a merge problem in Stephen Rothwell's linux-next
> tree, until Chris' drops this patch - causing Stephen to not merge the
> mmc tree for a while. I suppose that's the best we can do, until Chris
> shows up again.
>
> Kind regards
> Ulf Hansson
>
> > > > > > From: Micky Ching<micky_ching@xxxxxxxxxxxxxx>
> > > > > >
> > > > > > This reverts commit 1f7b581b3ffcb2a8437397a02f4af89fa6934d08.
> > > > > >
> > > > > > The patch depend on commit c42deffd5b53c9e583d83c7964854ede2f12410d
> > > > > > <mmc: rtsx: add support for pre_req and post_req>, but the previous
> > > > > > patch was discard. So we have to delete the patch.
> > > > > >
> > > > > > Signed-off-by: Micky Ching<micky_ching@xxxxxxxxxxxxxx>
> > > > Acked-by: Ulf Hansson<ulf.hansson@xxxxxxxxxx>
> > --
> > Lee Jones
> > Linaro STMicroelectronics Landing Team Lead
> > Linaro.org â Open source software for ARM SoCs
> > Follow Linaro: Facebook | Twitter | Blog
> .

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/