Re: linux-next: manual merge of the mmc tree with Linus' tree

2014-05-11 Thread Stephen Rothwell
Hi Ulf, On Fri, 9 May 2014 09:41:39 +0200 Ulf Hansson wrote: > > 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

Re: linux-next: manual merge of the mmc tree with Linus' tree

2014-05-09 Thread Ulf Hansson
On 9 May 2014 09:14, Lee Jones 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: mod