linux-kernel - linux-next: manual merge of the kvm tree with the 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]

Date:	Wed, 6 Feb 2013 15:43:40 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marc Zyngier <marc.zyngier@....com>,
	Christoffer Dall <c.dall@...tualopensystems.com>,
	Russell King <rmk@....linux.org.uk>,
	Cornelia Huck <cornelia.huck@...ibm.com>,
	Alexander Graf <agraf@...e.de>
Subject: linux-next: manual merge of the kvm tree with the arm tree

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
include/uapi/linux/kvm.h between commit aa024c2f35a0 ("KVM: ARM: Power
State Coordination Interface implementation") from the arm tree and
commits fa6b7fe9928d ("KVM: s390: Add support for channel I/O
instructions") and 1c810636556c ("KVM: PPC: BookE: Implement EPR exit")
from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/uapi/linux/kvm.h
index 7f2360a,9a2db57..0000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -636,7 -660,8 +661,9 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_IRQFD_RESAMPLE 82
  #define KVM_CAP_PPC_BOOKE_WATCHDOG 83
  #define KVM_CAP_PPC_HTAB_FD 84
+ #define KVM_CAP_S390_CSS_SUPPORT 85
+ #define KVM_CAP_PPC_EPR 86
 +#define KVM_CAP_ARM_PSCI 87
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

Content of type "application/pgp-signature" skipped