From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree Date: Sun, 20 Feb 2011 18:17:08 -0800 Message-ID: <20110221021708.GA7096@ericsson.com> References: <20110221121944.57f2ecfb.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Received: from imr3.ericy.com ([198.24.6.13]:38120 "EHLO imr3.ericy.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100Ab1BUCRb (ORCPT ); Sun, 20 Feb 2011 21:17:31 -0500 Content-Disposition: inline In-Reply-To: <20110221121944.57f2ecfb.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Jean Delvare On Sun, Feb 20, 2011 at 08:19:44PM -0500, Stephen Rothwell wrote: > Hi Guenter, > > Today's linux-next merge of the hwmon-staging tree got a conflict in > drivers/hwmon/Makefile between commits > bb6cd76e2364b13de54314aeadd9f61b75335caa ("Let Kconfig handle lis3lv02d > dependencies") and d8f00f1b531b25ac96a39385617ff1718bc8474b ("Move > lis3lv02d drivers to drivers/misc") from the jdelvare-hwmon tree and > commit 2c37a4a61ef4efaa7a802e0757d783d9b54ad064 ("hwmon: Add support for > Lineage Compact Power Line PEM devices") from the hwmon-staging tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Hi Stephen, yes, it would be great if you can carry the fix if it doesn't make too much trouble. I don't see an easy way around it. Thanks, Guenter