* linux-next: manual merge of the staging-next tree with Linus' tree
@ 2010-05-07 5:21 Stephen Rothwell
2010-05-07 16:40 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-05-07 5:21 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Cyrill Gorcunov
[-- Attachment #1: Type: text/plain, Size: 457 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the staging-next tree with Linus' tree
2010-05-07 5:21 linux-next: manual merge of the staging-next tree with Linus' tree Stephen Rothwell
@ 2010-05-07 16:40 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-05-07 16:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Cyrill Gorcunov
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-07 16:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-07 5:21 linux-next: manual merge of the staging-next tree with Linus' tree Stephen Rothwell
2010-05-07 16:40 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox