All of lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Ortiz <sameo@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Gregory Bean <gbean@codeaurora.org>,
	Rabin Vincent <rabin.vincent@stericsson.com>
Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree
Date: Thu, 12 Aug 2010 11:51:21 +0200	[thread overview]
Message-ID: <20100812095120.GA2528@sortiz-mobl> (raw)
In-Reply-To: <20100812144135.4834268b.sfr@canb.auug.org.au>

Hi Stephen,

On Thu, Aug 12, 2010 at 02:41:35PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> Today's linux-next merge of the mfd tree got a conflict in
> drivers/gpio/Kconfig between commit
> c34f16b70a52e348a62944fe0d5c7c1eb9ad5b72 ("gpio: sx150x: add Semtech I2C
> sx150x gpio expander driver") from Linus' tree and commit
> 59d11276842199a8ee525f1e88be7eafe8614e4c ("gpio: Add STMPE GPIO driver")
> from the mfd tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix for a while.
That should be fixed now on my for-next branch.
Thanks a lot for the report.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

  reply	other threads:[~2010-08-12  9:51 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-12  4:41 linux-next: manual merge of the mfd tree with Linus' tree Stephen Rothwell
2010-08-12  9:51 ` Samuel Ortiz [this message]
2010-09-13  1:54 Stephen Rothwell
2010-09-13 13:59 ` Samuel Ortiz
2011-03-21  1:26 Stephen Rothwell
2011-03-21  8:21 ` Linus Walleij
2011-03-22 11:16   ` Samuel Ortiz
2011-03-23 17:57     ` Linus Walleij
2011-03-22 11:08 ` Samuel Ortiz
2011-09-09  4:22 Stephen Rothwell
2012-01-12  1:06 Stephen Rothwell
2012-03-23  3:32 Stephen Rothwell
2012-03-23  9:41 ` Samuel Ortiz
2012-03-24 17:31   ` Grant Likely
2012-03-26  8:25     ` Samuel Ortiz
2012-03-28 22:47       ` Grant Likely
2012-05-22  4:10 Stephen Rothwell
2012-05-22  4:14 Stephen Rothwell
2012-05-23  3:01 Stephen Rothwell
2012-07-25  1:18 Stephen Rothwell
2012-07-25  6:40 ` Laxman Dewangan
2012-09-12  2:49 Stephen Rothwell
2012-09-18  3:19 Stephen Rothwell
2012-09-18  7:31 ` Dong Aisheng
2012-10-03  4:12 Stephen Rothwell
2012-11-28  3:20 Stephen Rothwell
2014-11-13  1:47 Stephen Rothwell
2018-03-08  1:33 Stephen Rothwell
2018-03-08  8:12 ` Lee Jones
2018-08-17  0:39 Stephen Rothwell
2018-08-21  8:08 ` Geert Uytterhoeven
2018-08-21  8:30   ` Stephen Rothwell
2018-08-28 13:34     ` Geert Uytterhoeven
2018-08-28 21:45       ` Stephen Rothwell
2019-02-08  2:37 Stephen Rothwell
2019-02-08  8:33 ` Jarkko Nikula
2019-05-09  2:44 Stephen Rothwell
2019-06-11  4:31 Stephen Rothwell
2023-03-05 22:49 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=20100812095120.GA2528@sortiz-mobl \
    --to=sameo@linux.intel.com \
    --cc=gbean@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rabin.vincent@stericsson.com \
    --cc=sfr@canb.auug.org.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.