Tiny merge resolutions along the way to 5.8-rc1. Change-Id: I0036e22af4e398b0bb3b9855ff90d60b9c0227ee Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Tiny merge resolutions along the way to 5.8-rc1. Change-Id: I0036e22af4e398b0bb3b9855ff90d60b9c0227ee Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>