Messages in this thread | | | Date | Wed, 12 Oct 2011 08:53:08 -0600 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the tip tree |
| |
On Wed, Oct 12, 2011 at 04:34:52PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/hv/Makefile between commit 6f4151c89b7d ("x86: Hyper-V: > Integrate the clocksource with Hyper-V detection code") from the tip tree > and commit 46a971913611 ("Staging: hv: move hyperv code out of staging > directory") from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary.
The fix looks correct, thanks.
greg k-h
| |