Re: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree

Guenter Roeck
2011-02-21T02:17:31Z

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