linux-next: manual merge of the voyager tree with the rr tree

[Stephen Rothwell]

Hi James,

Today's linux-next merge of the voyager tree got a conflict in
drivers/lguest/Kconfig between commit
7f8f1b5390ac9c433b0c4c693201a36fa3234a41 ("lguest:eventfd-notify") from
the rr tree and commit 0ff51d1467af91bca4210b0d09372b6e7ded7524 ("Revert
"x86: remove the Voyager 32-bit subarch"") from the voyager tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/lguest/Kconfig
index 6c566c1,76f2b36..0000000
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  config LGUEST
  	tristate "Linux hypervisor example code"
- 	depends on X86_32 && EXPERIMENTAL && !X86_PAE && EVENTFD
 -	depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !X86_VOYAGER
++	depends on X86_32 && EXPERIMENTAL && !X86_PAE && EVENTFD && !X86_VOYAGER
  	select HVC_DRIVER
  	---help---
  	  This is a very simple module which allows you to run
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/