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-11 Thread Stephen Rothwell
Hi Ulf, On Fri, 9 May 2014 09:41:39 +0200 Ulf Hansson ulf.hans...@linaro.org 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

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:

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

2014-05-09 Thread Lee Jones
> 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

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

2014-05-09 Thread Lee Jones
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

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 lee.jo...@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:

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

2014-05-08 Thread Stephen Rothwell
Hi Chris, 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

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

2014-05-08 Thread Stephen Rothwell
Hi Chris, 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)

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

2014-01-13 Thread Sören Brinkmann
On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote: > Hi Chris, > > Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS > between commit c2fd4e380322 ("MAINTAINERS: set up proper record for > Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan:

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

2014-01-13 Thread Sören Brinkmann
On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote: Hi Chris, Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS between commit c2fd4e380322 (MAINTAINERS: set up proper record for Xilinx Zynq) from Linus' tree and commit 45f210424b4b (mmc: arasan: Add

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

2014-01-12 Thread Stephen Rothwell
Hi Chris, Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS between commit c2fd4e380322 ("MAINTAINERS: set up proper record for Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add driver for Arasan SDHCI") from the mmc tree. I fixed it up (see below)

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

2014-01-12 Thread Stephen Rothwell
Hi Chris, Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS between commit c2fd4e380322 (MAINTAINERS: set up proper record for Xilinx Zynq) from Linus' tree and commit 45f210424b4b (mmc: arasan: Add driver for Arasan SDHCI) from the mmc tree. I fixed it up (see below) and