From: Greg Kroah-Hartman Date: Tue, 2 Jan 2018 14:13:41 +0000 (+0100) Subject: Merge 4.15.0-rc6 into usb-next X-Git-Tag: for-linus-20180210~22^2~56 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=01f1918833e4817fdb0810306c021c5cbee775d3;p=linux-block.git Merge 4.15.0-rc6 into usb-next We want the USB fixes in here, and this resolves a merge issue with the vhci_rx.c file. Signed-off-by: Greg Kroah-Hartman --- 01f1918833e4817fdb0810306c021c5cbee775d3