On Wed, Dec 20, 2017 at 01:09:49PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> drivers/usb/usbip/vhci_rx.c
>
> between commit:
>
> 8272d099d05f ("usbip: vhci: stop printing kernel pointer addresses in messages")
>
> from the usb.current tree and commit:
>
> 81d8a8eb0a97 ("USB: usbip: fix spelling mistake: "synchronuously" -> "synchronously"")
>
> from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/usb/usbip/vhci_rx.c
> index 112ebb90d8c9,a9813f1d507d..000000000000
> --- a/drivers/usb/usbip/vhci_rx.c
> +++ b/drivers/usb/usbip/vhci_rx.c
> @@@ -29,9 -30,9 +29,9 @@@ struct urb *pickup_urb_and_free_priv(st
> case -ENOENT:
> /* fall through */
> case -ECONNRESET:
> - dev_info(&urb->dev->dev,
> - "urb %p was unlinked %ssynchronously.\n", urb,
> - status == -ENOENT ? "" : "a");
> + dev_dbg(&urb->dev->dev,
> - "urb seq# %u was unlinked %ssynchronuously\n",
> ++ "urb seq# %u was unlinked %ssynchronously\n",
> + seqnum, status == -ENOENT ? "" : "a");
> break;
> case -EINPROGRESS:
> /* no info output */
Thanks for the fixup, I'll do it when these trees converge in a week or
so.
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
