[lkml]   [2009]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the usb tree with Linus' tree
    On Thu, Dec 24, 2009 at 09:30:36AM +1100, Stephen Rothwell wrote:
    > Hi Greg,
    > Today's linux-next merge of the usb tree got a conflict in
    > drivers/usb/serial/generic.c between commit
    > 119eecc831a42bd090543568932e440c6831f1bb ("Fix usb_serial_probe() problem
    > introduced by the recent kfifo changes") from Linus' tree and commit
    > 40b2ba0dfb62bed0f7cc6f699053d18ca4553e91 ("USB: serial: mct_usb232: add
    > drain on close") from the usb tree.
    > I fixed it up (see below) and can carry the fix for a while. The result
    > needs checking.

    Thanks, I fixed this up already in my tree and will resync in a few

    greg k-h

     \ /
      Last update: 2009-12-24 00:43    [W:0.036 / U:1.224 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site