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

[Jiri Kosina]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/