Merge 4.12-rc2 into usb-next

We want the USB fixes in here as well to handle testing and merge
issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/misc/iowarrior.c
Simple merge

diff --cc drivers/usb/storage/ene_ub6250.c
Simple merge