Greg, Stephen,
Below mentioned patch does not seem to have made it into the linux-next tree
(and other stable branches).
What do I need to do to correct this?
Best Regards,
Arjan
> 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
-----Original Message-----
From: Greg KH
Sent: Thursday, June 09, 2011 22:51
To: Stephen Rothwell
Cc: linux-next@xxxxxxxxxxxxxxx ; linux-kernel@xxxxxxxxxxxxxxx ; Arjan Mels ;
matt mooney
Subject: Re: linux-next: manual merge of the staging tree with the
staging.current tree
On Thu, Jun 09, 2011 at 11:42:06AM -0700, Greg KH wrote:
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.
This should now be resolved.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
