linux-kernel - linux-next: manual merge of the usb tree with the usb.current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20171220130949.51553723@canb.auug.org.au>
Date:   Wed, 20 Dec 2017 13:09:49 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Shuah Khan <shuahkh@....samsung.com>,
        Colin Ian King <colin.king@...onical.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree

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 */