Merge v6.18.5

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