From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Philip A. Prindeville" <philipp@redfish-solutions.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: linux-next: manual merge of the drivers-x86 tree with the tip tree
Date: Tue, 13 Mar 2012 17:51:41 +1100 [thread overview]
Message-ID: <20120313175141.1cf39f1991bcf776ee8c00ae@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1528 bytes --]
Hi Matthew,
Today's linux-next merge of the drivers-x86 tree got a conflicts in
arch/x86/Kconfig and arch/x86/platform/geode/Makefile between commit
da4e3302949f ("x86/geode/net5501: Add platform driver for Soekris
Engineering net5501") from the tip tree and commit b2a2f19ad3db ("geos:
Platform driver for Geos and Geos2 single-board computers") from the
drivers-x86 tree.
Just context changes. 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 36d459e,3a38c4c..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2146,12 -2133,13 +2146,19 @@@ config ALI
Note: You have to set alix.force=1 for boards with Award BIOS.
+config NET5501
+ bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)"
+ select GPIOLIB
+ ---help---
+ This option enables system support for the Soekris Engineering net5501.
+
+ config GEOS
+ bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
+ select GPIOLIB
+ depends on DMI
+ ---help---
+ This option enables system support for the Traverse Technologies GEOS.
+
endif # X86_32
config AMD_NB
diff --cc arch/x86/platform/geode/Makefile
index 246b788,d8ba564..0000000
--- a/arch/x86/platform/geode/Makefile
+++ b/arch/x86/platform/geode/Makefile
@@@ -1,2 -1,2 +1,3 @@@
obj-$(CONFIG_ALIX) += alix.o
+obj-$(CONFIG_NET5501) += net5501.o
+ obj-$(CONFIG_GEOS) += geos.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-13 6:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-13 6:51 Stephen Rothwell [this message]
2018-10-08 3:44 linux-next: manual merge of the drivers-x86 tree with the tip tree Stephen Rothwell
2018-10-08 10:55 ` Andy Shevchenko
2018-10-08 3:48 Stephen Rothwell
2018-10-08 10:55 ` Andy Shevchenko
2020-03-26 4:05 Stephen Rothwell
2020-03-26 8:47 ` Andy Shevchenko
2020-04-01 3:14 ` Stephen Rothwell
2020-04-01 6:49 ` Andy Shevchenko
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=20120313175141.1cf39f1991bcf776ee8c00ae@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mjg59@srcf.ucam.org \
--cc=peterz@infradead.org \
--cc=philipp@redfish-solutions.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).