On Mon, 2012-02-13 at 16:08 +1100, Stephen Rothwell wrote: > Hi Cong, > > Today's linux-next merge of the kmap_atomic tree got a conflict in > drivers/staging/hv/storvsc_drv.c between various commits from the staging > tree and commit c41a603a7235 ("hv: remove the second argument of k > [un]map_atomic()") from the kmap_atomic tree. > > I fixed it up (see below) and can carry the fix as necessary. Sounds fine, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html