Merge v6.12.68

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