* linux-next: manual merge of the staging tree with the hid tree
@ 2011-12-01 3:39 Stephen Rothwell
2011-12-01 3:51 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2011-12-01 3:39 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, K. Y. Srinivasan, Thomas Meyer, Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
hid-hyperv driver out of staging") from the hid tree and various commits
from the staging tree (this was drivers/staging/hv/hv_mouse.c).
The commit message says that all the changes that happened when this file
moved from staging have also been applied to the staging file, so I just
used the version from the hid tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the staging tree with the hid tree
2011-12-01 3:39 linux-next: manual merge of the staging tree with the hid tree Stephen Rothwell
@ 2011-12-01 3:51 ` Greg KH
2011-12-01 10:12 ` KY Srinivasan
2011-12-01 18:39 ` Greg KH
0 siblings, 2 replies; 8+ messages in thread
From: Greg KH @ 2011-12-01 3:51 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, K. Y. Srinivasan, Thomas Meyer, Jiri Kosina
On Thu, Dec 01, 2011 at 02:39:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
> hid-hyperv driver out of staging") from the hid tree and various commits
> from the staging tree (this was drivers/staging/hv/hv_mouse.c).
>
> The commit message says that all the changes that happened when this file
> moved from staging have also been applied to the staging file, so I just
> used the version from the hid tree.
Ok, that's fine, Jiri, want me to just delete the driver from my tree
now to remove any of these conflicts?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: linux-next: manual merge of the staging tree with the hid tree
2011-12-01 3:51 ` Greg KH
@ 2011-12-01 10:12 ` KY Srinivasan
2011-12-01 19:46 ` Jiri Kosina
2011-12-01 18:39 ` Greg KH
1 sibling, 1 reply; 8+ messages in thread
From: KY Srinivasan @ 2011-12-01 10:12 UTC (permalink / raw)
To: Greg KH, Stephen Rothwell
Cc: linux-next, linux-kernel, Thomas Meyer, Jiri Kosina
> -----Original Message-----
> From: Greg KH [mailto:greg@kroah.com]
> Sent: Wednesday, November 30, 2011 10:51 PM
> To: Stephen Rothwell
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; KY Srinivasan;
> Thomas Meyer; Jiri Kosina
> Subject: Re: linux-next: manual merge of the staging tree with the hid tree
>
> On Thu, Dec 01, 2011 at 02:39:52PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
> > hid-hyperv driver out of staging") from the hid tree and various commits
> > from the staging tree (this was drivers/staging/hv/hv_mouse.c).
> >
> > The commit message says that all the changes that happened when this file
> > moved from staging have also been applied to the staging file, so I just
> > used the version from the hid tree.
>
> Ok, that's fine, Jiri, want me to just delete the driver from my tree
> now to remove any of these conflicts?
Jiri,
Yesterday (Nov 30th, 2011) I had sent a patch for the mouse driver to fix a bug
that got introduced during the recent cleanup to exit staging. This patch was against
the staging tree that Greg is planning to delete. It is a trivial patch; can you pick this up
for the hid tree. If you prefer, I could rebase the patch against your tree. Let me know.
Regards,
K. Y
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the staging tree with the hid tree
2011-12-01 3:51 ` Greg KH
2011-12-01 10:12 ` KY Srinivasan
@ 2011-12-01 18:39 ` Greg KH
2011-12-01 19:42 ` Jiri Kosina
1 sibling, 1 reply; 8+ messages in thread
From: Greg KH @ 2011-12-01 18:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, K. Y. Srinivasan, Thomas Meyer, Jiri Kosina
On Wed, Nov 30, 2011 at 07:51:13PM -0800, Greg KH wrote:
> On Thu, Dec 01, 2011 at 02:39:52PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
> > hid-hyperv driver out of staging") from the hid tree and various commits
> > from the staging tree (this was drivers/staging/hv/hv_mouse.c).
> >
> > The commit message says that all the changes that happened when this file
> > moved from staging have also been applied to the staging file, so I just
> > used the version from the hid tree.
>
> Ok, that's fine, Jiri, want me to just delete the driver from my tree
> now to remove any of these conflicts?
I've removed it from my tree now.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the staging tree with the hid tree
2011-12-01 18:39 ` Greg KH
@ 2011-12-01 19:42 ` Jiri Kosina
0 siblings, 0 replies; 8+ messages in thread
From: Jiri Kosina @ 2011-12-01 19:42 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel, K. Y. Srinivasan,
Thomas Meyer
On Thu, 1 Dec 2011, Greg KH wrote:
> > > Today's linux-next merge of the staging tree got a conflict in
> > > drivers/hid/hid-hyperv.c between commit b95f5bcb811e ("HID: Move the
> > > hid-hyperv driver out of staging") from the hid tree and various commits
> > > from the staging tree (this was drivers/staging/hv/hv_mouse.c).
> > >
> > > The commit message says that all the changes that happened when this file
> > > moved from staging have also been applied to the staging file, so I just
> > > used the version from the hid tree.
> >
> > Ok, that's fine, Jiri, want me to just delete the driver from my tree
> > now to remove any of these conflicts?
>
> I've removed it from my tree now.
Yes, I think it's the proper thing to do now.
Thanks,
--
Jiri Kosina
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: linux-next: manual merge of the staging tree with the hid tree
2011-12-01 10:12 ` KY Srinivasan
@ 2011-12-01 19:46 ` Jiri Kosina
2011-12-01 19:54 ` KY Srinivasan
0 siblings, 1 reply; 8+ messages in thread
From: Jiri Kosina @ 2011-12-01 19:46 UTC (permalink / raw)
To: KY Srinivasan
Cc: Greg KH, Stephen Rothwell, linux-next, linux-kernel, Thomas Meyer
On Thu, 1 Dec 2011, KY Srinivasan wrote:
> > Ok, that's fine, Jiri, want me to just delete the driver from my tree
> > now to remove any of these conflicts?
>
> Yesterday (Nov 30th, 2011) I had sent a patch for the mouse driver to
> fix a bug that got introduced during the recent cleanup to exit staging.
> This patch was against the staging tree that Greg is planning to delete.
> It is a trivial patch; can you pick this up for the hid tree. If you
> prefer, I could rebase the patch against your tree. Let me know.
I will pick the one you have sent against staging tree, no need for you to
respin.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: linux-next: manual merge of the staging tree with the hid tree
2011-12-01 19:46 ` Jiri Kosina
@ 2011-12-01 19:54 ` KY Srinivasan
0 siblings, 0 replies; 8+ messages in thread
From: KY Srinivasan @ 2011-12-01 19:54 UTC (permalink / raw)
To: Jiri Kosina
Cc: Greg KH, Stephen Rothwell, linux-next, linux-kernel, Thomas Meyer
> -----Original Message-----
> From: Jiri Kosina [mailto:jkosina@suse.cz]
> Sent: Thursday, December 01, 2011 2:46 PM
> To: KY Srinivasan
> Cc: Greg KH; Stephen Rothwell; linux-next@vger.kernel.org; linux-
> kernel@vger.kernel.org; Thomas Meyer
> Subject: RE: linux-next: manual merge of the staging tree with the hid tree
>
> On Thu, 1 Dec 2011, KY Srinivasan wrote:
>
> > > Ok, that's fine, Jiri, want me to just delete the driver from my tree
> > > now to remove any of these conflicts?
> >
> > Yesterday (Nov 30th, 2011) I had sent a patch for the mouse driver to
> > fix a bug that got introduced during the recent cleanup to exit staging.
> > This patch was against the staging tree that Greg is planning to delete.
> > It is a trivial patch; can you pick this up for the hid tree. If you
> > prefer, I could rebase the patch against your tree. Let me know.
>
> I will pick the one you have sent against staging tree, no need for you to
> respin.
Thanks Jiri.
Regards,
K. Y
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the staging tree with the hid tree
@ 2011-12-01 3:40 Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2011-12-01 3:40 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Haiyang Zhang, Mike Sterling,
K. Y. Srinivasan, Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 1610 bytes --]
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@canb.auug.org.au
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 #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-12-01 20:04 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-01 3:39 linux-next: manual merge of the staging tree with the hid tree Stephen Rothwell
2011-12-01 3:51 ` Greg KH
2011-12-01 10:12 ` KY Srinivasan
2011-12-01 19:46 ` Jiri Kosina
2011-12-01 19:54 ` KY Srinivasan
2011-12-01 18:39 ` Greg KH
2011-12-01 19:42 ` Jiri Kosina
2011-12-01 3:40 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).