Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758762AbZKYMC5 (ORCPT ); Wed, 25 Nov 2009 07:02:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758695AbZKYMC4 (ORCPT ); Wed, 25 Nov 2009 07:02:56 -0500 Received: from mail-fx0-f213.google.com ([209.85.220.213]:49865 "EHLO mail-fx0-f213.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758639AbZKYMC4 (ORCPT ); Wed, 25 Nov 2009 07:02:56 -0500 Subject: Re: linux-next: manual merge of the voltage tree with the mfd tree From: Liam Girdwood To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Haojian Zhuang , Samuel Ortiz In-Reply-To: <20091125175602.0e765187.sfr@canb.auug.org.au> References: <20091125175602.0e765187.sfr@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" Date: Wed, 25 Nov 2009 11:56:32 +0000 Message-ID: <1259150192.3697.63.camel@odin> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 831 Lines: 26 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/