Subject: linux-next: manual merge of the kvm-x86 tree with the kvm-riscv tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 15 Aug 2023 16:34:49 +1000

Hi all,

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

  tools/testing/selftests/kvm/include/test_util.h

between commit:

  dfaf20af7649 ("KVM: arm64: selftests: Replace str_with_index with strdup_printf")

from the kvm-riscv tree and commit:

  e5119382499c ("KVM: selftests: Add guest_snprintf() to KVM selftests")

from the kvm-x86 tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/kvm/include/test_util.h
index 7e0182f837b5,7a5907da1719..000000000000
--- a/tools/testing/selftests/kvm/include/test_util.h
+++ b/tools/testing/selftests/kvm/include/test_util.h
@@@ -186,6 -185,7 +185,9 @@@ static inline uint32_t atoi_non_negativ
  	return num;
  }
  
 +char *strdup_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2), nonnull(1)));
 +
+ int guest_vsnprintf(char *buf, int n, const char *fmt, va_list args);
+ int guest_snprintf(char *buf, int n, const char *fmt, ...);
+ 
  #endif /* SELFTEST_KVM_TEST_UTIL_H */