From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Cyrill Gorcunov <gorcunov@openvz•org>
Subject: linux-next: manual merge of the staging-next tree with Linus' tree
Date: Fri, 7 May 2010 15:21:08 +1000 [thread overview]
Message-ID: <20100507152108.49975171.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2010-05-07 5:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-07 5:21 Stephen Rothwell [this message]
2010-05-07 16:40 ` linux-next: manual merge of the staging-next tree with Linus' tree Greg KH
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=20100507152108.49975171.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gorcunov@openvz$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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