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,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the staging tree with the tip tree
Date: Wed, 12 Oct 2011 08:53:08 -0600 [thread overview]
Message-ID: <20111012145308.GA18777@kroah.com> (raw)
In-Reply-To: <20111012163452.7f1822bb8dca107daf26d28b@canb.auug.org.au>
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
next prev parent reply other threads:[~2011-10-12 14:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-12 5:34 linux-next: manual merge of the staging tree with the tip tree Stephen Rothwell
2011-10-12 14:53 ` Greg KH [this message]
2015-08-13 4:55 Stephen Rothwell
2015-08-13 15:34 ` Greg KH
2016-03-02 3:35 Stephen Rothwell
2016-03-02 7:54 ` Thomas Gleixner
2016-03-02 17:43 ` Greg KH
2016-03-02 17:53 ` Jose Rivera
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=20111012145308.GA18777@kroah.com \
--to=greg@kroah.com \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).