lkml.org 
[lkml]   [2010]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the bkl-trivial tree with the mmc tree
Date
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


\
 
 \ /
  Last update: 2010-09-20 11:17    [W:0.023 / U:1.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site