[lkml]   [2011]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the staging tree with the staging.current tree
    On Thu, Jun 09, 2011 at 04:58:04PM +1000, Stephen Rothwell wrote:
    > Hi Greg,
    > Today's linux-next merge of the staging tree got a conflict in
    > drivers/staging/usbip/stub_dev.c between commit d3ac07788017 ("staging:
    > usbip: bugfix prevent driver unbind") from the staging.current tree and
    > commit d012c2a5aca1 ("staging: usbip: stub_dev.c: move stub_driver
    > definition and update driver name") from the staging tree.
    > I fixed it up (see below) and can carry the fix as necessary.

    Looks correct, thanks for doing this.

    greg k-h

     \ /
      Last update: 2011-06-09 21:07    [W:0.044 / U:32.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site