Merge tag 'v7.0-rc5' into driver-core-next

We need the driver-core fixes in here as well to build on top of.

Signed-off-by: Danilo Krummrich <dakr@kernel.org>

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

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

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

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