Merge v7.2.12

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