linux-kernel - Re: linux-next: manual merge of the spi tree with the mfd tree

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20110322110530.GC2351@sortiz-mobl>
Date:	Tue, 22 Mar 2011 12:05:31 +0100
From:	Samuel Ortiz <sameo@...ux.intel.com>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Denis Turischev <denis@...pulab.co.il>,
	Thomas Gleixner <tglx@...utronix.de>
Subject: Re: linux-next: manual merge of the spi tree with the mfd tree

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@...pulab.co.il>
> Date:   Mon Mar 14 12:53:05 2011 +0200
> [...]
>     Signed-off-by: Denis Turischev <denis@...pulab.co.il>
>     Signed-off-by: Samuel Ortiz <sameo@...ux.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/
--
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/