From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Denis Turischev <denis@compulab.co.il>,
Samuel Ortiz <sameo@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-next: manual merge of the spi tree with the mfd tree
Date: Thu, 17 Mar 2011 23:16:27 -0600 [thread overview]
Message-ID: <20110318051627.GE18545@angua.secretlab.ca> (raw)
In-Reply-To: <20110318154017.e45aa888.sfr@canb.auug.org.au>
On Fri, Mar 18, 2011 at 03:40:17PM +1100, Stephen Rothwell wrote:
> Hi Grant,
>
> Today's linux-next merge of the spi tree got a conflict in
> drivers/gpio/Kconfig between commit 390ff13830e5 ("gpio: Add Tunnel Creek
> support to sch_gpio") from the mfd tree and commit 61ab3fe57e45 ("gpio;
> Make Intel chipset gpio drivers depend on x86") from the spi tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary. I am assuming that the Tunnel Creek stuff should also depend
> on X86?
It would appear so. Thanks Stephen.
BTW Samuel, looking at the commit message for 390ff13830e5:
commit 390ff13830e5bcc4f8585b396e3d15b1c04c0282
Author: Denis Turischev <denis@compulab.co.il>
Date: Mon Mar 14 12:53:05 2011 +0200
[...]
Signed-off-by: Denis Turischev <denis@compulab.co.il>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
My Acked-by seems to be missing from the commit log.
g.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/gpio/Kconfig
> index 7ef9108,b46442d..0000000
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@@ -100,8 -100,8 +100,8 @@@ config GPIO_VR41X
> Say yes here to support the NEC VR4100 series General-purpose I/O Uint
>
> config GPIO_SCH
> - tristate "Intel SCH GPIO"
> + tristate "Intel SCH/TunnelCreek GPIO"
> - depends on GPIOLIB && PCI
> + depends on GPIOLIB && PCI && X86
> select MFD_CORE
> select LPC_SCH
> help
next prev parent reply other threads:[~2011-03-18 5:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-18 4:40 linux-next: manual merge of the spi tree with the mfd tree Stephen Rothwell
2011-03-18 5:16 ` Grant Likely [this message]
2011-03-22 11:05 ` Samuel Ortiz
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=20110318051627.GE18545@angua.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=denis@compulab.co.il \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
--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).