linux-next: manual merge of the staging tree with the tip tree

Stephen Rothwell
2011-10-12T05:34:57Z

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/hv/Makefile between commit 6f4151c89b7d ("x86: Hyper-V:
Integrate the clocksource with Hyper-V detection code") from the tip tree
and commit 46a971913611 ("Staging: hv: move hyperv code out of staging
directory") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/hv/Makefile
index 14e3c6a,e071c12..0000000
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@@ -1,14 -1,7 +1,6 @@@
- obj-$(CONFIG_HYPERV) += hv_vmbus.o
-obj-$(CONFIG_HYPERV) += hv_timesource.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
- obj-$(CONFIG_HYPERV_BLOCK) += hv_blkvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
- obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
obj-$(CONFIG_HYPERV_MOUSE) += hv_mouse.o

- hv_vmbus-y := vmbus_drv.o \
- hv.o connection.o channel.o \
- channel_mgmt.o ring_buffer.o
- hv_storvsc-y := storvsc_drv.o storvsc.o
- hv_blkvsc-y := blkvsc_drv.o storvsc.o
+ hv_storvsc-y := storvsc_drv.o
hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
- hv_utils-y := hv_util.o hv_kvp.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]