Messages in this thread | | | Date | Thu, 9 Jun 2011 11:42:06 -0700 | From | Greg KH <> | Subject | Re: 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
| |