linux-kernel - linux-next: manual merge of the kvm-ppc tree with the 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: <20140602163429.357cf678@canb.auug.org.au>
Date:	Mon, 2 Jun 2014 16:34:29 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alexander Graf <agraf@...e.de>,
	Christoffer Dall <cdall@...columbia.edu>,
	Marc Zyngier <marc.zyngier@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Anup Patel <anup.patel@...aro.org>
Subject: linux-next: manual merge of the kvm-ppc tree with the  tree

Hi Alexander,

Today's linux-next merge of the kvm-ppc tree got a conflict in
include/uapi/linux/kvm.h between commit 717abd208dff ("KVM: Add
capability to advertise PSCI v0.2 support") from the kvm-arm tree and
commit f2e91042a807 ("KVM: PPC: Add CAP to indicate hcall fixes") from
the kvm-ppc 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 32cf446f1911,16c923de85e7..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -756,7 -748,7 +756,8 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_S390_IRQCHIP 99
  #define KVM_CAP_IOEVENTFD_NO_LENGTH 100
  #define KVM_CAP_VM_ATTRIBUTES 101
 -#define KVM_CAP_PPC_FIXUP_HCALL 102
 +#define KVM_CAP_ARM_PSCI_0_2 102
++#define KVM_CAP_PPC_FIXUP_HCALL 103
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)