lkml.org 
[lkml]   [2014]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the mmc tree with Linus' tree
From
On 9 May 2014 09:14, Lee Jones <lee.jones@linaro.org> wrote:
>> Today's linux-next merge of the mmc tree got a conflict in
>> drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
>> rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
>> the tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
>> remove smatch warnings") from the mmc tree.
>>
>> I fixed it up (maybe - see below and in the final tree) and can carry
>> the fix as necessary (no action is required).
>
> FYI: From what Ulf (co-maintainer of MMC) says, this was expected and
> will continue to happen until a pending revert is merged.
>

Hi Stehpen,

Within this context; while Chris is being busy, I would be able to
help out better as co-maintainer - if we would add my published mmc
git tree, into your linux-next merge. Could you do that?

My intent at this point, is to get patches tested in linux-next, but
still get them merged via Chris' mmc tree. Does that make sense?

Here is my git tree:
git://git.linaro.org/people/ulf.hansson/mmc.git

I have added a next branch, currently it points to the commit for
"Linux 3.15-rc4", so it holds no patches yet.

Kind regards
Ulf Hansson


\
 
 \ /
  Last update: 2014-05-09 10:21    [W:0.041 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site