[lkml]   [2009]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the usb tree with the ttydev tree
On Wed, 10 Jun 2009 18:41:14 +1000
Stephen Rothwell <> wrote:

> Hi Greg, Alan,
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/sierra.c between commit
> 968b6bc702be2b0953212f1ca56b1dc889c1c72d ("tty-usb-sierra-add-urb-funcs")
> from the ttydev tree and various commits from the usb tree.
> There is some overlap between the ttydev patch and the usb patches. I
> have just used the version of this file from USB tree (since it seems
> that there are many more changes there).
> Please sort this out ...

Already working on this and getting all the patches into the ttydev tree.
Sierra are also now checking over my merge to check its ok.


 \ /
  Last update: 2009-06-10 12:07    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean