* linux-next: manual merge of the kbuild tree with the hwmon-staging tree
@ 2011-03-18 0:48 Stephen Rothwell
2011-03-18 3:50 ` Guenter Roeck
2011-03-18 11:22 ` Michal Marek
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-03-18 0:48 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-next, linux-kernel, matt mooney, Guenter Roeck
Hi Michal,
Today's linux-next merge of the kbuild tree got a conflict in
drivers/hwmon/Makefile between commit 442aba78728e ("hwmon: PMBus device
driver") from the hwmon-staging tree and commit 5c39e31195f4 ("hwmon:
change to new flag variable") from the kbuild 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 aaf6ca9,974f9cc..0000000
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -114,14 -112,5 +114,12 @@@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
+# PMBus drivers
+obj-$(CONFIG_PMBUS) += pmbus_core.o
+obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o
+obj-$(CONFIG_SENSORS_MAX16064) += max16064.o
+obj-$(CONFIG_SENSORS_MAX34440) += max34440.o
+obj-$(CONFIG_SENSORS_MAX8688) += max8688.o
+
- ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
- EXTRA_CFLAGS += -DDEBUG
- endif
+ ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the kbuild tree with the hwmon-staging tree
2011-03-18 0:48 linux-next: manual merge of the kbuild tree with the hwmon-staging tree Stephen Rothwell
@ 2011-03-18 3:50 ` Guenter Roeck
2011-03-18 11:22 ` Michal Marek
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2011-03-18 3:50 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michal Marek, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, matt mooney
Hi Stephen,
On Thu, Mar 17, 2011 at 08:48:36PM -0400, Stephen Rothwell wrote:
> Hi Michal,
>
> Today's linux-next merge of the kbuild tree got a conflict in
> drivers/hwmon/Makefile between commit 442aba78728e ("hwmon: PMBus device
> driver") from the hwmon-staging tree and commit 5c39e31195f4 ("hwmon:
> change to new flag variable") from the kbuild tree.
>
Linus merged the hwmon-staging tree, so the conflicts should hopefully
be resolved in a day or so.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the kbuild tree with the hwmon-staging tree
2011-03-18 0:48 linux-next: manual merge of the kbuild tree with the hwmon-staging tree Stephen Rothwell
2011-03-18 3:50 ` Guenter Roeck
@ 2011-03-18 11:22 ` Michal Marek
1 sibling, 0 replies; 3+ messages in thread
From: Michal Marek @ 2011-03-18 11:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, matt mooney, Guenter Roeck
On 18.3.2011 01:48, Stephen Rothwell wrote:
> Hi Michal,
>
> Today's linux-next merge of the kbuild tree got a conflict in
> drivers/hwmon/Makefile between commit 442aba78728e ("hwmon: PMBus device
> driver") from the hwmon-staging tree and commit 5c39e31195f4 ("hwmon:
> change to new flag variable") from the kbuild tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
I am aware of the conflict, but as you say, it is just changed context.
Thanks,
Michal
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-18 11:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-18 0:48 linux-next: manual merge of the kbuild tree with the hwmon-staging tree Stephen Rothwell
2011-03-18 3:50 ` Guenter Roeck
2011-03-18 11:22 ` Michal Marek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox