Subject: linux-next: manual merge of the kvm tree with the rcu tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Dec 2014 18:28:48 +1100

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
arch/ia64/kvm/Kconfig between commit d80bd9c0e85f ("tinification: Make
SRCU optional by using CONFIG_SRCU") from the rcu tree and commit
003f7de62589 ("KVM: ia64: remove") from the kvm tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]