Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master

PPC KVM fixes for 5.2

- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
  vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.

1 files changed, 2 insertions, 2 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index bb28b178d929..342c7c781ba5 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3027,7 +3027,7 @@ sub process {
                         my @compats = $rawline =~ /\"([a-zA-Z0-9\-\,\.\+_]+)\"/g;
 
                         my $dt_path = $root . "/Documentation/devicetree/bindings/";
-                        my $vp_file = $dt_path . "vendor-prefixes.txt";
+                        my $vp_file = $dt_path . "vendor-prefixes.yaml";
 
                         foreach my $compat (@compats) {
                                 my $compat2 = $compat;
@@ -3042,7 +3042,7 @@ sub process {
 
                                 next if $compat !~ /^([a-zA-Z0-9\-]+)\,/;
                                 my $vendor = $1;
-                                `grep -Eq "^$vendor\\b" $vp_file`;
+                                `grep -Eq "\\"\\^\Q$vendor\E,\\.\\*\\":" $vp_file`;
                                 if ( $? >> 8 ) {
                                         WARN("UNDOCUMENTED_DT_STRING",
                                              "DT compatible string vendor \"$vendor\" appears un-documented -- check $vp_file\n" . $herecurr);