From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Cyrill Gorcunov <gorcunov@openvz.org>
Subject: Re: linux-next: manual merge of the staging-next tree with Linus' tree
Date: Fri, 7 May 2010 09:40:12 -0700 [thread overview]
Message-ID: <20100507164012.GA21927@kroah.com> (raw)
In-Reply-To: <20100507152108.49975171.sfr@canb.auug.org.au>
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
prev parent reply other threads:[~2010-05-07 16:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100507164012.GA21927@kroah.com \
--to=greg@kroah.com \
--cc=gorcunov@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox