Merge 4.18-rc7 into staging-next

We want the staging changes in here for testing and merge issues.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/ks7010/ks_hostif.c
Simple merge

diff --cc drivers/staging/rtl8188eu/core/rtw_recv.c
Simple merge

diff --cc drivers/staging/rtl8188eu/core/rtw_security.c
Simple merge