From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Marcelo Tosatti <mtosatti@redhat.com>,
Gleb Natapov <gleb@kernel.org>, KVM <kvm@vger.kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicholas Piggin <npiggin@gmail.com>,
Paul Mackerras <paulus@ozlabs.org>
Subject: linux-next: manual merge of the kvm tree with the powerpc tree
Date: Fri, 10 Feb 2017 14:47:07 +1100 [thread overview]
Message-ID: <20170210144707.64071681@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/include/asm/head-64.h
between commit:
852e5da99d15 ("powerpc/64s: Tidy up after exception handler rework")
from the powerpc tree and commit:
7ede531773ea ("KVM: PPC: Book3S: Move 64-bit KVM interrupt handler out from alt section")
from the kvm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/include/asm/head-64.h
index a475711cd9c3,9bd81619d090..000000000000
--- a/arch/powerpc/include/asm/head-64.h
+++ b/arch/powerpc/include/asm/head-64.h
@@@ -223,8 -217,8 +223,8 @@@ name
FIXED_SECTION_ENTRY_BEGIN(virt_trampolines, name)
#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
-#define TRAMP_KVM_BEGIN(name) \
+#define TRAMP_KVM_BEGIN(name) \
- TRAMP_REAL_BEGIN(name)
+ TRAMP_VIRT_BEGIN(name)
#else
#define TRAMP_KVM_BEGIN(name)
#endif
next reply other threads:[~2017-02-10 3:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-10 3:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-22 5:25 linux-next: manual merge of the kvm tree with the powerpc tree Stephen Rothwell
2021-06-22 6:23 ` Paolo Bonzini
2021-06-22 14:51 ` Michael Ellerman
2021-06-22 16:52 ` Paolo Bonzini
2018-12-21 5:16 Stephen Rothwell
2017-02-15 2:38 Stephen Rothwell
2017-02-15 10:52 ` Michael Ellerman
2017-02-14 3:20 Stephen Rothwell
2017-02-14 3:16 Stephen Rothwell
2017-02-14 3:12 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
2016-07-21 4:37 Stephen Rothwell
2016-07-18 5:55 Stephen Rothwell
2016-07-18 5:54 Stephen Rothwell
2016-03-04 4:30 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=20170210144707.64071681@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--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=npiggin@gmail.com \
--cc=paulus@ozlabs.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;
as well as URLs for NNTP newsgroup(s).