> -----Original Message----- > From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx] > Sent: Friday, January 06, 2012 2:41 AM > To: Cong Wang > Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Haiyang Zhang; > KY Srinivasan; Greg KH > Subject: linux-next: manual merge of the kmap_atomic tree with the staging > tree > > Hi Cong, > > Today's linux-next merge of the kmap_atomic tree got conflicts in > drivers/net/hyperv/netvsc_drv.c and drivers/net/hyperv/rndis_filter.c between > commit 453263421f88 ("net/hyperv: Remove unnecessary kmap_atomic in > netvsc driver") from the staging tree and commit e91cd643d15d ("hv: > remove the second argument of k[un]map_atomic()") from the kmap_atomic > tree. > > The former removed the code modified by the latter, so I did that. Good! Thank you for the merging. - Haiyang -- 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
