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

[Stephen Rothwell]

Hi all,

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

  tools/testing/selftests/kvm/aarch64/psci_test.c

between commit:

  c3c369b508d9 ("KVM: selftests: Use MPIDR_HWID_BITMASK from cputype.h")

from the kvm-arm tree and commit:

  730cfa45b5f4 ("KVM: selftests: Define _GNU_SOURCE for all selftests code")

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/aarch64/psci_test.c
index 9fa3578d47d5,1c8c6f0c1ca3..000000000000
--- a/tools/testing/selftests/kvm/aarch64/psci_test.c
+++ b/tools/testing/selftests/kvm/aarch64/psci_test.c
@@@ -10,12 -10,7 +10,9 @@@
   *  - A test for KVM's handling of PSCI SYSTEM_SUSPEND and the associated
   *    KVM_SYSTEM_EVENT_SUSPEND UAPI.
   */
- 
- #define _GNU_SOURCE
- 
 +#include <linux/kernel.h>
  #include <linux/psci.h>
 +#include <asm/cputype.h>
  
  #include "kvm_util.h"
  #include "processor.h"

Attachment: pgp8IZpSIHOy7.pgp
Description: OpenPGP digital signature