> -----Original Message----- > From: Greg KH [mailto:greg@xxxxxxxxx] > Sent: Wednesday, November 30, 2011 10:51 PM > To: Stephen Rothwell > Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
