Merge 5.6-rc3 into staging-next

We need the staging fixes in here, and it resolves a merge issue in the
MAINTAINERS file.

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

diff --cc MAINTAINERS
index 9a4c715,fcd79fc..83bf5bc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -17089,7 -17095,12 +17090,7 @@@ S:  Maintaine
  F:    drivers/usb/common/ulpi.c
  F:    include/linux/ulpi/
  
- UNICODE SUBSYSTEM:
 -ULTRA-WIDEBAND (UWB) SUBSYSTEM
 -L:    devel@driverdev.osuosl.org
 -S:    Obsolete
 -F:    drivers/staging/uwb/
 -
+ UNICODE SUBSYSTEM
  M:    Gabriel Krisman Bertazi <krisman@collabora.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Supported

diff --cc drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
Simple merge

diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
Simple merge