linux-kernel - linux-next: manual merge of the kvm-ppc tree with Linus' 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:	Fri, 5 Oct 2012 12:55:40 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alexander Graf <agraf@...e.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alex Williamson <alex.williamson@...hat.com>,
	Avi Kivity <avi@...hat.com>,
	Bharat Bhushan <r65777@...escale.com>,
	Scott Wood <scottwood@...escale.com>,
	Liu Yu <yu.liu@...escale.com>
Subject: linux-next: manual merge of the kvm-ppc tree with Linus' tree

Hi Alexander,

Today's linux-next merge of the kvm-ppc tree got a conflict in
include/linux/kvm.h between commit 7a84428af7ca ("KVM: Add resampling
irqfds for level triggered interrupts") from Linus' tree and commit
2b3ac3d5956c ("KVM: PPC: booke: Add watchdog emulation") 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/linux/kvm.h
index 0a6d6ba,99c3c50..0000000
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -625,7 -628,7 +628,8 @@@ struct kvm_ppc_smmu_info 
  #ifdef __KVM_HAVE_READONLY_MEM
  #define KVM_CAP_READONLY_MEM 81
  #endif
 -#define KVM_CAP_PPC_BOOKE_WATCHDOG 82
 +#define KVM_CAP_IRQFD_RESAMPLE 82
++#define KVM_CAP_PPC_BOOKE_WATCHDOG 83
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

Content of type "application/pgp-signature" skipped