From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Marcelo Tosatti <mtosatti@redhat.com>,
Gleb Natapov <gleb@kernel.org>, <kvm@vger.kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
<linuxppc-dev@lists.ozlabs.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
Alexey Kardashevskiy <aik@ozlabs.ru>,
Paul Mackerras <paulus@samba.org>
Subject: linux-next: manual merge of the kvm tree with the powerpc tree
Date: Fri, 4 Mar 2016 15:30:26 +1100 [thread overview]
Message-ID: <20160304153026.76c2732b@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kvm/book3s_64_vio_hv.c
between commit:
f64e8084c94b ("powerpc/mm: Move hash related mmu-*.h headers to book3s/")
from the powerpc tree and commit:
d3695aa4f452 ("KVM: PPC: Add support for multiple-TCE hcalls")
from the kvm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/kvm/book3s_64_vio_hv.c
index 039028d3ccb5,44be73e6aa26..000000000000
--- a/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
@@@ -29,7 -30,8 +30,8 @@@
#include <asm/tlbflush.h>
#include <asm/kvm_ppc.h>
#include <asm/kvm_book3s.h>
-#include <asm/mmu-hash64.h>
+#include <asm/book3s/64/mmu-hash.h>
+ #include <asm/mmu_context.h>
#include <asm/hvcall.h>
#include <asm/synch.h>
#include <asm/ppc-opcode.h>
next reply other threads:[~2016-03-04 4:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-04 4:30 Stephen Rothwell [this message]
2016-07-18 5:54 Stephen Rothwell
2016-07-18 5:55 Stephen Rothwell
2016-07-21 4:37 Stephen Rothwell
2017-02-10 3:47 Stephen Rothwell
2017-02-10 3:59 Stephen Rothwell
2017-02-10 10:06 ` Paolo Bonzini
2017-02-14 8:45 ` Michael Ellerman
2017-02-14 13:34 ` Paolo Bonzini
2017-02-15 11:16 ` Michael Ellerman
2017-02-15 11:28 ` Paolo Bonzini
2017-02-14 3:12 Stephen Rothwell
2017-02-14 3:16 Stephen Rothwell
2017-02-14 3:20 Stephen Rothwell
2017-02-15 2:38 Stephen Rothwell
2017-02-15 10:52 ` Michael Ellerman
2018-12-21 5:16 Stephen Rothwell
2021-06-22 5:25 Stephen Rothwell
2021-06-22 6:23 ` Paolo Bonzini
2021-06-22 14:51 ` Michael Ellerman
2021-06-22 16:52 ` Paolo Bonzini
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=20160304153026.76c2732b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=aik@ozlabs.ru \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=mtosatti@redhat.com \
--cc=paulus@samba.org \
/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
all inboxes | Powered by JetHome®