> -----Original Message----- > From: Jiri Kosina [mailto:jkosina@xxxxxxx] > Sent: Thursday, December 01, 2011 2:46 PM > To: KY Srinivasan > Cc: Greg KH; Stephen Rothwell; linux-next@xxxxxxxxxxxxxxx; linux- > kernel@xxxxxxxxxxxxxxx; 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 -- 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
