From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Gregory Haskins <gregory.haskins@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alexandre Bounine <alexandre.bounine@idt•com>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the alacrity tree with Linus' tree
Date: Fri, 25 Mar 2011 15:06:34 +1100 [thread overview]
Message-ID: <20110325150634.aa405d4b.sfr@canb.auug.org.au> (raw)
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@canb•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
next reply other threads:[~2011-03-25 4:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-25 4:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-24 2:06 linux-next: manual merge of the alacrity tree with Linus' tree Stephen Rothwell
2010-08-16 4:19 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110325150634.aa405d4b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alexandre.bounine@idt$(echo .)com \
--cc=gregory.haskins@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox