| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20110325150634.aa405d4b.sfr@canb.auug.org.au>
Date: Fri, 25 Mar 2011 15:06:34 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Gregory Haskins <gregory.haskins@...il.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Alexandre Bounine <alexandre.bounine@....com>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the alacrity tree with Linus' tree
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 sfr@...b.auug.org.au
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists