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
next prev parent reply other threads:[~2012-10-09 17:10 UTC|newest]
Thread overview: 5+ 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:42 ` Marek Vašut
2012-10-09 15:51 ` Chris Ball
2012-10-09 17:10 ` Marek Vasut [this message]
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=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).