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

From: Stephen Rothwell
Date: Wed Nov 30 2011 - 22:40:14 EST


Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/hv/Makefile and drivers/staging/hv/Kconfig between
commits b95f5bcb811e ("HID: Move the hid-hyperv driver out of staging")
and 045b1684bc21 ("Staging: hv: mousevsc: Remove the mouse driver from
the staging tree") from the hid tree and commit 95fa0405c599 ("staging:
hv: move hv_netvsc out of staging area") from the staging tree.

I fixed them up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/hv/Kconfig
index 6c0dc30,8a51166..0000000
--- a/drivers/staging/hv/Kconfig
+++ b/drivers/staging/hv/Kconfig
@@@ -3,9 -3,9 +3,3 @@@ config HYPERV_STORAG
depends on HYPERV && SCSI
help
Select this option to enable the Hyper-V virtual storage driver.
--
- config HYPERV_NET
- tristate "Microsoft Hyper-V virtual network driver"
- depends on HYPERV && NET
- help
- Select this option to enable the Hyper-V virtual network driver.
-config HYPERV_MOUSE
- tristate "Microsoft Hyper-V mouse driver"
- depends on HYPERV && HID
- help
- Select this option to enable the Hyper-V mouse driver.
diff --cc drivers/staging/hv/Makefile
index fbe9a42,6c97747..0000000
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@@ -1,5 -1,4 +1,3 @@@
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
- obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
-obj-$(CONFIG_HYPERV_MOUSE) += hv_mouse.o

hv_storvsc-y := storvsc_drv.o
- hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o

Attachment: pgp00000.pgp
Description: PGP signature