archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Wei Liu <>,
	Thomas Gleixner <>, Ingo Molnar <>,
	"H. Peter Anvin" <>,
	Peter Zijlstra <>
Cc: Ingo Molnar <>,
	Linux Kernel Mailing List <>,
	Linux Next Mailing List <>,
	Michael Kelley <>
Subject: linux-next: manual merge of the hyperv tree with the tip tree
Date: Mon, 21 Jun 2021 20:01:25 +1000	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1796 bytes --]

Hi all,

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


between commit:

  c43426334b31 ("x86: Fix leftover comment typos")

from the tip tree and commit:

  a4d7e8ae4a54 ("Drivers: hv: Move Hyper-V extended capability check to arch neutral code")

from the hyperv tree.

I fixed it up (the comment changed by the former commit was move so I
applied the following merge fix 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: Mon, 21 Jun 2021 19:56:59 +1000
Subject: [PATCH] x86: move of part of "Fix leftover comment typos"

Signed-off-by: Stephen Rothwell <>
 drivers/hv/hv_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hv/hv_common.c b/drivers/hv/hv_common.c
index f0053c786891..7f42da98d377 100644
--- a/drivers/hv/hv_common.c
+++ b/drivers/hv/hv_common.c
@@ -27,7 +27,7 @@ bool hv_query_ext_cap(u64 cap_query)
 	 * output parameter to the hypercall below and so it should be
 	 * compatible with 'virt_to_phys'. Which means, it's address should be
 	 * directly mapped. Use 'static' to keep it compatible; stack variables
-	 * can be virtually mapped, making them imcompatible with
+	 * can be virtually mapped, making them incompatible with
 	 * 'virt_to_phys'.
 	 * Hypercall input/output addresses should also be 8-byte aligned.

Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2021-06-21 10:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-21 10:01 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-26  6:22 linux-next: manual merge of the hyperv tree with the tip tree Stephen Rothwell
2021-10-26  8:27 ` Borislav Petkov
2021-10-28 10:39   ` Wei Liu
2021-03-15  3:35 Stephen Rothwell
2021-03-15 19:09 ` Michael Kelley
2021-03-16 15:02 ` Borislav Petkov
2021-03-16 15:05   ` Wei Liu
2021-03-16 21:07     ` Stephen Rothwell
2021-03-16 21:31       ` Borislav Petkov

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \

* 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).