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 sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpHlKLZjDJDO.pgp
Description: OpenPGP digital signature
