From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 24 Feb 2020 07:37:48 +0000 (+0100)
Subject: Merge 5.6-rc3 into staging-next
X-Git-Tag: v5.7-rc1~190^2~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c85f15519d45588ce6ab8ad18616d2c0175a25d6;p=thirdparty%2Fkernel%2Flinux.git

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

c85f15519d45588ce6ab8ad18616d2c0175a25d6
diff --cc MAINTAINERS
index 9a4c715d1e50b,fcd79fc38928f..83bf5bcb94663
--- a/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