Merge 4.15-rc6 into staging-next

We need the staging fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/android/ion/ion.c
Simple merge

diff --cc drivers/staging/android/ion/ion_cma_heap.c
Simple merge