Subject: linux-next: manual merge of the alacrity tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 25 Mar 2011 15:06:34 +1100

Hi Gregory,

Today's linux-next merge of the alacrity tree got a conflict in
arch/x86/Kconfig between commit 388b78adc989 ("rapidio: modify
configuration to support PCI-SRIO controller") from Linus' tree and
commit 18dc365707fd ("vbus: add a "vbus-proxy" bus model for vbus_driver
objects") from the alacrity tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/x86/Kconfig
index cc6c53a,035edb7..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2097,16 -2067,8 +2097,18 @@@ source "drivers/pcmcia/Kconfig
  
  source "drivers/pci/hotplug/Kconfig"
  
 +config RAPIDIO
 +	bool "RapidIO support"
 +	depends on PCI
 +	default n
 +	help
 +	  If you say Y here, the kernel will include drivers and
 +	  infrastructure code to support RapidIO interconnect devices.
 +
 +source "drivers/rapidio/Kconfig"
 +
+ source "drivers/vbus/Kconfig"
+ 
  endmenu