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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <536C2AD0.7020104@realsil.com.cn>
Date:	Fri, 9 May 2014 09:09:36 +0800
From:	micky <micky_ching@...lsil.com.cn>
To:	Ulf Hansson <ulf.hansson@...aro.org>,
	Lee Jones <lee.jones@...aro.org>
CC:	Chris Ball <chris@...ntf.net>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Dan Carpenter <dan.carpenter@...cle.com>,
	<devel@...uxdriverproject.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	linux-mmc <linux-mmc@...r.kernel.org>,
	Roger <rogerable@...ltek.com>,
	Wei WANG <wei_wang@...lsil.com.cn>,
	Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [PATCH 1/2] mmc: rtsx: Revert "mmc: rtsx: modify errorhandleandremovesmatch warnings"

Hi Ulf

On 05/08/2014 04:22 PM, Ulf Hansson wrote:
> On 8 May 2014 09:55, Lee Jones <lee.jones@...aro.org> 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@...lsil.com.cn>
>>>>>>
>>>>>> 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@...lsil.com.cn>
>>>> Acked-by: Ulf Hansson<ulf.hansson@...aro.org>
>> --
>> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/