Merge 4.15-rc6 into driver-core-next

We want the fixes in here as well.

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

diff --cc drivers/base/cacheinfo.c
Simple merge

diff --cc lib/kobject_uevent.c
Simple merge