Re: linux-next: manual merge of the kmap_atomic tree with the mdtree

[Cong Wang]

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!

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