Hi all,
Today's linux-next merge of the hyperv tree got a conflict in:
arch/x86/hyperv/hv_init.c
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 <sfr@xxxxxxxxxxxxxxxx>
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 <sfr@xxxxxxxxxxxxxxxx>
---
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.
*/
--
2.30.2
--
Cheers,
Stephen Rothwell
Attachment:
pgpFs0PFby2Mk.pgp
Description: OpenPGP digital signature
