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.
--
Cheers,
Stephen Rothwell [email protected]
diff --cc drivers/hwmon/Makefile
index 753117c,4681981..0000000
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -62,6 -62,10 +62,7 @@@ obj-$(CONFIG_SENSORS_JC42) += jc42.
obj-$(CONFIG_SENSORS_JZ4740) += jz4740-hwmon.o
obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o
obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o
+ obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o
-obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o
-obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d.o lis3lv02d_spi.o
-obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d.o lis3lv02d_i2c.o
obj-$(CONFIG_SENSORS_LM63) += lm63.o
obj-$(CONFIG_SENSORS_LM70) += lm70.o
obj-$(CONFIG_SENSORS_LM73) += lm73.o
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
Hi Guenter,
On Sun, 20 Feb 2011 18:17:08 -0800 Guenter Roeck <[email protected]> wrote:
>
> 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.
These sort of conflict fixes are easy to carry ("git rerere" does it for me).
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/