public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Liam Girdwood <lrg@slimlogic•co.uk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Haojian Zhuang <haojian.zhuang@marvell•com>,
	Samuel Ortiz <sameo@linux•intel.com>
Subject: Re: linux-next: manual merge of the voltage tree with the mfd tree
Date: Wed, 25 Nov 2009 11:56:32 +0000	[thread overview]
Message-ID: <1259150192.3697.63.camel@odin> (raw)
In-Reply-To: <20091125175602.0e765187.sfr@canb.auug.org.au>

Hi Stephen,

On Wed, 2009-11-25 at 17:56 +1100, Stephen Rothwell wrote:
> Hi Liam,
> 
> Today's linux-next merge of the voltage tree got a conflict in
> drivers/mfd/Kconfig between commit
> b60463644b8baea3c649faeb9d7c44c104f14588 ("mfd: Fix 88PM8607 I2C
> dependency") from the mfd tree and commit
> 258e3427f83a573d738344c2f5499da5e026e1df ("regulator: add 88PM8607 PMIC
> driver") from the voltage tree.
> 
> I fixed it up using the mfd tree version. ("depends on I2C=y" v "depends
> on I2C").

Thanks for letting me know and the fixup. Will you be carrying the fix ?

Thanks

Liam

next prev parent reply	other threads:[~2009-11-25 12:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-25  6:56 linux-next: manual merge of the voltage tree with the mfd tree Stephen Rothwell
2009-11-25 11:56 ` Liam Girdwood [this message]
2009-11-25 13:23   ` 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=1259150192.3697.63.camel@odin \
    --to=lrg@slimlogic$(echo .)co.uk \
    --cc=haojian.zhuang@marvell$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sameo@linux$(echo .)intel.com \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox