Merge 4.16-rc6 into staging-next

We want the staging fixes in here as well to handle merge/test issues.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/kernel.h
Simple merge