Merge 5.0-rc6 into usb-next

We want the USB fixes in here, and this resolves a merge issue in the
uas driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2020-09-21 09:06:42 +02:00
commit 629b911153
197 changed files with 1515 additions and 1344 deletions