From patchwork Tue Jun 2 07:18:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11583313 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B470490 for ; Tue, 2 Jun 2020 07:18:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9DEA5207FB for ; Tue, 2 Jun 2020 07:18:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="N8KtvWTZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726241AbgFBHSH (ORCPT ); Tue, 2 Jun 2020 03:18:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725907AbgFBHSH (ORCPT ); Tue, 2 Jun 2020 03:18:07 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1EE9C061A0E; Tue, 2 Jun 2020 00:18:06 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49bk0C2qSpz9sSc; Tue, 2 Jun 2020 17:18:03 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1591082283; bh=MrJSykbWLAXwqJ9lxap8vVIzf19HCg++CsqikCUsi20=; h=Date:From:To:Cc:Subject:From; b=N8KtvWTZh5CwZEffJ51n/KOsacImwvPLrK9AW+eNpmYa1ENeYZBT5SeJEwXtbJVA5 EHWrEMfEK6b3jqAL61+SxRAIZ1sNd0dFZHP3LksnZ4qGeLrlr4e6R8PGzq8QTBmRVg 5+FBURqeV9tPWIP7+cAYDobKTC1jOnmojkB1kjTRYolnnvU1mIY2am4EeWxj8IDUFN h822MWaolaMXW025AKc4iTmG+OBr722pu97qlzexKF6Gd5xEM1cfU3AE2zsmkwIh/t IuEhMhJJc20rCtDnOWBNGlh0Ik7dgRXMFd4WnFwWMBQhZ15dArF5Fx0y7hbt1GJ8l+ BnWSa0ygtakiA== Date: Tue, 2 Jun 2020 17:18:02 +1000 From: Stephen Rothwell To: Wei Liu , Paolo Bonzini , KVM Cc: Linux Next Mailing List , Linux Kernel Mailing List , Jon Doron , Michael Kelley Subject: linux-next: manual merge of the hyperv tree with the kvm tree Message-ID: <20200602171802.560d07bc@canb.auug.org.au> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 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 --- 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