Merge 4.19-rc7 into char-misc-next

We want the fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/thunderbolt/icm.c
Simple merge

diff --cc drivers/thunderbolt/nhi.c
Simple merge