Merge 5.0-rc6 into char-misc-next

We need the char-misc fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/misc/mic/vop/vop_main.c
Simple merge

diff --cc kernel/events/ring_buffer.c
Simple merge