Messages in this thread | | | Date | Thu, 1 Dec 2011 20:46:24 +0100 (CET) | From | Jiri Kosina <> | 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 Kosina SUSE Labs
| |