Messages in this thread | | | Subject | Re: linux-next: manual merge of the kmap_atomic tree with the staging tree | From | Cong Wang <> | Date | Fri, 06 Jan 2012 16:17:22 +0800 |
| |
On Fri, 2012-01-06 at 18:40 +1100, Stephen Rothwell wrote: > 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.
This makes sense for me.
Thanks for fixing it!
| |