* linux-next: manual merge of the hyperv tree with the kvm tree
@ 2020-06-02 7:18 Stephen Rothwell
2020-06-02 13:56 ` Wei Liu
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2020-06-02 7:18 UTC (permalink / raw)
To: Wei Liu, Paolo Bonzini, KVM
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jon Doron,
Michael Kelley
[-- Attachment #1: Type: text/plain, Size: 2160 bytes --]
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 <sfr@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 <sfr@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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the hyperv tree with the kvm tree
2020-06-02 7:18 linux-next: manual merge of the hyperv tree with the kvm tree Stephen Rothwell
@ 2020-06-02 13:56 ` Wei Liu
2020-06-02 16:26 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Wei Liu @ 2020-06-02 13:56 UTC (permalink / raw)
To: Stephen Rothwell, Paolo Bonzini
Cc: Wei Liu, Paolo Bonzini, KVM, Linux Next Mailing List,
Linux Kernel Mailing List, Jon Doron, Michael Kelley
On Tue, Jun 02, 2020 at 05:18:02PM +1000, Stephen Rothwell wrote:
> 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")
>
Paolo
As far as I can tell you merged that series a few days ago. Do you plan
to submit it to Linus in this merge window? How do you want to proceed
to fix the conflict?
Wei.
> 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 <sfr@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 <sfr@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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the hyperv tree with the kvm tree
2020-06-02 13:56 ` Wei Liu
@ 2020-06-02 16:26 ` Paolo Bonzini
2020-06-02 16:29 ` Wei Liu
0 siblings, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2020-06-02 16:26 UTC (permalink / raw)
To: Wei Liu, Stephen Rothwell
Cc: KVM, Linux Next Mailing List, Linux Kernel Mailing List,
Jon Doron, Michael Kelley
On 02/06/20 15:56, Wei Liu wrote:
>>
>> between commit:
>>
>> 22ad0026d097 ("x86/hyper-v: Add synthetic debugger definitions")
>>
> Paolo
>
> As far as I can tell you merged that series a few days ago. Do you plan
> to submit it to Linus in this merge window? How do you want to proceed
> to fix the conflict?
Hi, Linus can fix this conflict.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the hyperv tree with the kvm tree
2020-06-02 16:26 ` Paolo Bonzini
@ 2020-06-02 16:29 ` Wei Liu
0 siblings, 0 replies; 4+ messages in thread
From: Wei Liu @ 2020-06-02 16:29 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Wei Liu, Stephen Rothwell, KVM, Linux Next Mailing List,
Linux Kernel Mailing List, Jon Doron, Michael Kelley
On Tue, Jun 02, 2020 at 06:26:26PM +0200, Paolo Bonzini wrote:
> On 02/06/20 15:56, Wei Liu wrote:
> >>
> >> between commit:
> >>
> >> 22ad0026d097 ("x86/hyper-v: Add synthetic debugger definitions")
> >>
> > Paolo
> >
> > As far as I can tell you merged that series a few days ago. Do you plan
> > to submit it to Linus in this merge window? How do you want to proceed
> > to fix the conflict?
>
> Hi, Linus can fix this conflict.
OK. I will write down in my pull request what needs to be done to fix
the conflicts.
Wei.
>
> Paolo
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-02 16:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-02 7:18 linux-next: manual merge of the hyperv tree with the kvm tree Stephen Rothwell
2020-06-02 13:56 ` Wei Liu
2020-06-02 16:26 ` Paolo Bonzini
2020-06-02 16:29 ` Wei Liu
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).