From: Samuel Ortiz <sameo@linux.intel.com>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Denis Turischev <denis@compulab.co.il>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-next: manual merge of the spi tree with the mfd tree
Date: Tue, 22 Mar 2011 12:05:31 +0100 [thread overview]
Message-ID: <20110322110530.GC2351@sortiz-mobl> (raw)
In-Reply-To: <20110318051627.GE18545@angua.secretlab.ca>
Hi Grant,
On Thu, Mar 17, 2011 at 11:16:27PM -0600, Grant Likely wrote:
> 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.
I fixed the merge issue in my tree now, since Grant's GPIO bits are in it
seems.
> 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.
This was a temporary commit pushed to my tree before getting your ACK. Commit
10022449a9d0ff4deeae1b8fddae3e35d62b7958 should have it now.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
prev parent reply other threads:[~2011-03-22 11:05 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
2011-03-22 11:05 ` Samuel Ortiz [this message]
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=20110322110530.GC2351@sortiz-mobl \
--to=sameo@linux.intel.com \
--cc=denis@compulab.co.il \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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).