Re: linux-next: manual merge of the mfd tree with the tmio-mmc tree

From: Stephen Rothwell
Date: Sun Mar 07 2010 - 21:16:46 EST

Hi Ian,

On Thu, 7 Jan 2010 19:51:55 +0100 Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> wrote:
> On Thu, Jan 07, 2010 at 02:16:13PM +1100, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the mfd tree got conflicts in
> > drivers/mfd/asic3.c, drivers/mfd/t7l66xb.c, drivers/mfd/tc6387xb.c,
> > drivers/mfd/tc6393xb.c, drivers/mfd/tmio_core.c,
> > drivers/mmc/host/tmio_mmc.c, drivers/mmc/host/tmio_mmc.h and
> > include/linux/mfd/tmio.h between commit
> > 4cd83bd05e6c817a4a72ababd82bf5ae700c021d ("MMC: hardware abstraction for
> > CNF area") from the tmio-mmc tree and commit
> > b3df6513659704ece28da3b80cc36c2a8de315ce ("mfd: tmio_mmc hardware
> > abstraction for CNF area") from the mfd tree.
> >
> > These are very similar patches, I used the version from the mfd tree as
> > that appears to be a later version. Can you and Ian please sort this out
> > between you.
> Ian, could you please remove this commit from your tree ? I'm planning to send
> the one in my mfd tree soon to Linus.

The above conflict still occurs and there are more. I am assuming that
this is because I have not been able to fetch the tmio-mmc tree for some
time (I get "[0:]: errno=Connection
refused") (and your mail server will not accept mail from me either - I
hope you see this on lkml or linux-next).

I have dropped the tmio-mmc tree for today.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature