From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jean Delvare <khali@linux-fr.org>
Subject: linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree
Date: Mon, 21 Feb 2011 12:19:44 +1100 [thread overview]
Message-ID: <20110221121944.57f2ecfb.sfr@canb.auug.org.au> (raw)
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 sfr@canb.auug.org.au
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
next reply other threads:[~2011-02-21 1:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 1:19 Stephen Rothwell [this message]
2011-02-21 2:17 ` linux-next: manual merge of the hwmon-staging tree with the jdelvare-hwmon tree Guenter Roeck
2011-02-21 2:31 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-01-10 2:20 Stephen Rothwell
2011-01-10 3:46 ` Guenter Roeck
2011-01-10 4:32 ` Stephen Rothwell
2011-01-10 8:57 ` Jean Delvare
2011-01-10 10:16 ` Guenter Roeck
2011-01-10 10:47 ` Jean Delvare
2011-01-10 11:11 ` Guenter Roeck
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=20110221121944.57f2ecfb.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=guenter.roeck@ericsson.com \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox