Merge v5.7-rc5 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 May 2020 07:00:09 +0000 (09:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 May 2020 07:00:09 +0000 (09:00 +0200)
commitc8be6af9ef16cf44d690fc227a0d2dd7a526ef05
tree805518819810a3ab4f1c53dc8d529f987abe9db8
parentc78c31b374a68be79cb4a03ef5b6c187f034e903
parent2ef96a5bb12be62ef75b5828c0aab838ebb29cb8
Merge v5.7-rc5 into driver-core-next

We want the driver core fixes in here and this resolves a merge issue
with drivers/base/dd.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/core.c
drivers/base/dd.c
drivers/base/platform.c