lkml.org 
[lkml]   [2012]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the kmap_atomic tree with the md tree
From
Date
On Thu, 2012-03-15 at 17:09 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/md/bitmap.c between commit 83a191d7b09d ("md/bitmap: remove some
> pointless locking") from the md tree and commit 63716d51774d ("md: remove
> the second argument of k[un]map_atomic()") from the kmap_atomic tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Ok, looks good to me.

Thanks!



\
 
 \ /
  Last update: 2012-03-15 09:51    [from the cache]
©2003-2011 Jasper Spaans