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,
David Gibson <david@gibson•dropbear.id.au>,
Paul Mackerras <paulus@ozlabs•org>
Subject: linux-next: manual merge of the kvm tree with the powerpc tree
Date: Tue, 14 Feb 2017 14:12:26 +1100 [thread overview]
Message-ID: <20170214141226.6920079a@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/include/asm/hvcall.h
between commit:
64b40ffbc830 ("powerpc/pseries: Add hypercall wrappers for hash page table resizing")
from the powerpc tree and commit:
cc3d2940133d ("powerpc/64: Enable use of radix MMU under hypervisor on POWER9")
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/hvcall.h
index 490c4b9f4e3a,54d11b3a6bf7..000000000000
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@@ -276,8 -276,7 +276,9 @@@
#define H_GET_MPP_X 0x314
#define H_SET_MODE 0x31C
#define H_CLEAR_HPT 0x358
+#define H_RESIZE_HPT_PREPARE 0x36C
+#define H_RESIZE_HPT_COMMIT 0x370
+ #define H_REGISTER_PROC_TBL 0x37C
#define H_SIGNAL_SYS_RESET 0x380
#define MAX_HCALL_OPCODE H_SIGNAL_SYS_RESET
next reply other threads:[~2017-02-14 3:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 3:12 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-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-10 3:47 Stephen Rothwell
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=20170214141226.6920079a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=david@gibson$(echo .)dropbear.id.au \
--cc=gleb@kernel$(echo .)org \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=mtosatti@redhat$(echo .)com \
--cc=paulus@ozlabs$(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