Merge 4.13-rc5 into driver-core-next

We want the fixes in here as well for testing.

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

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

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

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