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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240430142814.183a8167@canb.auug.org.au>
Date: Tue, 30 Apr 2024 14:28:14 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Sean Christopherson <seanjc@...gle.com>, Christoffer Dall
 <cdall@...columbia.edu>, Marc Zyngier <maz@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Oliver Upton
 <oliver.upton@...ux.dev>
Subject: linux-next: manual merge of the kvm-x86 tree with the kvm-arm tree

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"

Content of type "application/pgp-signature" skipped