lkml.org 
[lkml]   [2011]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRE: 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


\
 
 \ /
  Last update: 2011-12-01 20:49    [W:0.055 / U:0.268 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site