linux-next: manual merge of the hyperv tree with the kvm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the hyperv tree got a conflict in:

  arch/x86/include/asm/hyperv-tlfs.h

between commit:

  22ad0026d097 ("x86/hyper-v: Add synthetic debugger definitions")

from the kvm tree and commit:

  c55a844f46f9 ("x86/hyperv: Split hyperv-tlfs.h into arch dependent and 
independent files")

from the hyperv tree.

I fixed it up (I removed the conficting bits from that file and added
the following patch) 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.

From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Tue, 2 Jun 2020 17:15:49 +1000
Subject: [PATCH] x86/hyperv: merge fix for hyperv-tlfs.h split

Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
 include/asm-generic/hyperv-tlfs.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/asm-generic/hyperv-tlfs.h 
b/include/asm-generic/hyperv-tlfs.h
index 262fae9526b1..e73a11850055 100644
--- a/include/asm-generic/hyperv-tlfs.h
+++ b/include/asm-generic/hyperv-tlfs.h
@@ -145,6 +145,9 @@ struct ms_hyperv_tsc_page {
 #define HVCALL_SET_VP_REGISTERS                        0x0051
 #define HVCALL_POST_MESSAGE                    0x005c
 #define HVCALL_SIGNAL_EVENT                    0x005d
+#define HVCALL_POST_DEBUG_DATA                 0x0069
+#define HVCALL_RETRIEVE_DEBUG_DATA             0x006a
+#define HVCALL_RESET_DEBUG_SESSION             0x006b
 #define HVCALL_RETARGET_INTERRUPT              0x007e
 #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af
 #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0
@@ -177,6 +180,7 @@ enum HV_GENERIC_SET_FORMAT {
 #define HV_STATUS_INVALID_HYPERCALL_INPUT      3
 #define HV_STATUS_INVALID_ALIGNMENT            4
 #define HV_STATUS_INVALID_PARAMETER            5
+#define HV_STATUS_OPERATION_DENIED             8
 #define HV_STATUS_INSUFFICIENT_MEMORY          11
 #define HV_STATUS_INVALID_PORT_ID              17
 #define HV_STATUS_INVALID_CONNECTION_ID                18
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

pgpPSqSE6_jqj.pgp
Description: OpenPGP digital signature