Prev: [PATCH V2] Oprofile: Change CPUIDS from decimal to hex, and add some comments
Next: perf probe: Support DW_OP_call_frame_cfa in debuginfo
From: Greg KH on 7 May 2010 13:00
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH V2] Oprofile: Change CPUIDS from decimal to hex, and add some comments
Next: perf probe: Support DW_OP_call_frame_cfa in debuginfo