Messages in this thread | | | Date | Fri, 7 May 2010 09:40:12 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging-next tree with Linus' tree |
| |
On Fri, May 07, 2010 at 03:21:08PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging-next tree got a conflict in > drivers/staging/hv/hv.c between commit > fa8ad0257ea256381126ecf447694622216c600f ("Staging: hv: Fix up memory > leak on HvCleanup") from Linus' tree and commit > eda95eef15e86e100aaeeec4e8ed3eb1eced2967 ("Staging: hv: rename Hv.c to > hv.c") from the staging-next tree. > > I used the staging-next version.
Yes, that's the proper version, thanks.
greg k-h
| |