linux-kernel - Re: linux-next: manual merge of the spi-mb tree with the mmc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <5048421F.7080101@bluegiga.com>
Date:	Thu, 06 Sep 2012 09:26:39 +0300
From:	Lauri Hintsala <lauri.hintsala@...egiga.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chris Ball <cjb@...top.org>, Marek Vasut <marex@...x.de>
Subject: Re: linux-next: manual merge of the spi-mb tree with the mmc tree

On 09/05/2012 06:15 AM, Stephen Rothwell wrote:
> Hi Mark,
>
> Today's linux-next merge of the spi-mb tree got a conflict in
> drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 ("mmc: mxs-mmc:
> fix deadlock caused by recursion loop") from the mmc tree and commit
> 829c1bf40b92 ("mmc: spi: Pull out parts shared between MMC and SPI") from
> the spi-mb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Reviewed and tested. Looks good.

Lauri
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/