All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: Chris Ball <cjb@laptop.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org,
	Attila Kinali <attila@kinali.ch>,
	Lauri Hintsala <lauri.hintsala@bluegiga.com>,
	Shawn Guo <shawn.guo@linaro.org>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: [PATCH] mmc: mxs: fix build regression from mismerge
Date: Tue, 9 Oct 2012 19:10:45 +0200	[thread overview]
Message-ID: <201210091910.45992.marex@denx.de> (raw)
In-Reply-To: <877gqzabjy.fsf@octavius.laptop.org>

Dear Chris Ball,

> Hi,
> 
> On Tue, Oct 09 2012, Arnd Bergmann wrote:
> > From all I can tell, the patches
> > 
> > fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop"
> > 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI"
> > 
> > came in through separate branches and cause this build error when
> > combined.
[...]

> 
> I'll send Marek's change to Linus once the main MMC merge has been pulled.
> Thanks,
> 
> - Chris.

Thanks! Sorry from my previous reply from Android phone, I just saw what 
horrible email it generated :-(

Best regards,
Marek Vasut

WARNING: multiple messages have this Message-ID (diff)
From: marex@denx.de (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] mmc: mxs: fix build regression from mismerge
Date: Tue, 9 Oct 2012 19:10:45 +0200	[thread overview]
Message-ID: <201210091910.45992.marex@denx.de> (raw)
In-Reply-To: <877gqzabjy.fsf@octavius.laptop.org>

Dear Chris Ball,

> Hi,
> 
> On Tue, Oct 09 2012, Arnd Bergmann wrote:
> > From all I can tell, the patches
> > 
> > fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop"
> > 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI"
> > 
> > came in through separate branches and cause this build error when
> > combined.
[...]

> 
> I'll send Marek's change to Linus once the main MMC merge has been pulled.
> Thanks,
> 
> - Chris.

Thanks! Sorry from my previous reply from Android phone, I just saw what 
horrible email it generated :-(

Best regards,
Marek Vasut

  reply	other threads:[~2012-10-09 17:10 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-09 15:37 [PATCH] mmc: mxs: fix build regression from mismerge Arnd Bergmann
2012-10-09 15:37 ` Arnd Bergmann
2012-10-09 15:42 ` Marek Vašut
2012-10-09 15:42   ` Marek Vašut
2012-10-09 15:51 ` Chris Ball
2012-10-09 15:51   ` Chris Ball
2012-10-09 17:10   ` Marek Vasut [this message]
2012-10-09 17:10     ` Marek Vasut
2012-10-09 18:23   ` Arnd Bergmann
2012-10-09 18:23     ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201210091910.45992.marex@denx.de \
    --to=marex@denx.de \
    --cc=arnd@arndb.de \
    --cc=attila@kinali.ch \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=cjb@laptop.org \
    --cc=lauri.hintsala@bluegiga.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=shawn.guo@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.