Subject: Re: linux-next: manual merge of the bkl-trivial tree with the mmc tree

From: Arnd Bergmann <[email-masked]>
Date: Mon, 20 Sep 2010 11:15:25 +0200

On Monday 20 September 2010, Stephen Rothwell wrote:
> Today's linux-next merge of the bkl-trivial tree got a conflict in
> drivers/mmc/card/block.c between commit
> 28280d210bacf6788a5e4b12c5a9430bd50860b4 ("mmc: make number of mmcblk
> minors configurable") from the mmc tree and commit
> 5778067afcfd8b718ffc3744c25fdd194fc886a1 ("block: autoconvert trivial BKL
> users to private mutex") from the bkl-trivial tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Looks good, thanks!

Chris, do you want to take my patch into your tree instead? Or even better
you could figure out if the BKL is actually needed there and remove it
otherwise so we don't need to introduce the mutex here.

	Arnd