From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Avi Kivity <avi@qumranet•com>
Cc: linux-next@vger•kernel.org, Hollis Blanchard <hollisb@us•ibm.com>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
Paul Mackerras <paulus@samba•org>
Subject: linux-next: manual merge of the kvm tree
Date: Mon, 29 Dec 2008 16:11:05 +1100 [thread overview]
Message-ID: <20081229161105.2a5125e9.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 764 bytes --]
Hi Avi,
Today's linux-next merge of the kvm tree got a conflict in
arch/powerpc/kvm/powerpc.c between commits
2a4aca1144394653269720ffbb5a325a77abd5fa ("powerpc/mm: Split low level
tlb invalidate for nohash processors") and
fad7b9b51e21a97e9e2662f1b51869ed2d209097 ("powerpc: Fix KVM build on
ppc440") from the powerpc tree (already merged into Linus' tree) and
commits 48e5562f7278782ae5d1772b7baa1ff76f035285 ("KVM: ppc: Refactor
powerpc.c to relocate 440-specific code") and
408e29020273079445b5a9161a80d6ce07ab6b1c ("KVM: ppc: Implement in-kernel
exit timing statistics") from the kvm tree.
I just used the kvm tree version of the file.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-12-29 5:11 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-29 5:11 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-12 2:57 linux-next: manual merge of the kvm tree Stephen Rothwell
2009-06-12 7:19 ` Avi Kivity
2009-01-02 0:44 Stephen Rothwell
2008-12-22 3:52 Stephen Rothwell
2008-12-22 5:13 ` Benjamin Herrenschmidt
2008-12-22 21:39 ` Hollis Blanchard
2008-12-22 21:41 ` Benjamin Herrenschmidt
2008-12-22 22:03 ` Hollis Blanchard
2008-12-22 22:11 ` Benjamin Herrenschmidt
2008-12-22 22:29 ` Paul Mackerras
2008-12-22 22:44 ` Hollis Blanchard
2008-12-23 0:07 ` Paul Mackerras
2008-12-23 1:02 ` Hollis Blanchard
2008-12-23 1:38 ` Benjamin Herrenschmidt
2008-11-25 6:49 Stephen Rothwell
2008-10-29 2:58 Stephen Rothwell
2008-10-29 9:55 ` Avi Kivity
2008-10-29 10:35 ` Stephen Rothwell
2008-10-15 5:27 Stephen Rothwell
2008-09-17 5:50 Stephen Rothwell
2008-09-17 5:24 Stephen Rothwell
2008-09-15 0:14 Stephen Rothwell
2008-09-15 6:53 ` Ingo Molnar
2008-09-12 19:50 Stephen Rothwell
2008-09-12 19:53 ` Arjan van de Ven
2008-09-12 19:59 ` Stephen Rothwell
2008-08-26 4:45 Stephen Rothwell
2008-08-26 7:39 ` Avi Kivity
2008-08-26 7:41 ` Stephen Rothwell
2008-08-15 4:46 Stephen Rothwell
2008-08-04 3:13 Stephen Rothwell
2008-07-22 3:43 Stephen Rothwell
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=20081229161105.2a5125e9.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=avi@qumranet$(echo .)com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=hollisb@us$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulus@samba$(echo .)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