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

From: Stephen Rothwell
Date: Mon Dec 08 2014 - 02:29:01 EST

Next message: Michael S. Tsirkin: "Re: [PATCH] uio/uio_pci_generic: don't return zero on failure path in probe()"
Previous message: Dmitry Torokhov: "[PATCH 2/2] Input: gpio_keys - replace timer and workqueue with delayed workqueue"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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: pgpKczklS_RDG.pgp
Description: OpenPGP digital signature

Next message: Michael S. Tsirkin: "Re: [PATCH] uio/uio_pci_generic: don't return zero on failure path in probe()"
Previous message: Dmitry Torokhov: "[PATCH 2/2] Input: gpio_keys - replace timer and workqueue with delayed workqueue"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]