| Message ID | 20180419091105.3943-6-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | checkpatch: backport UTF-8 fixes and MAINTAINERS check | expand |
On 19.04.2018 11:11, Stefan Hajnoczi wrote: > From: Joe Perches <joe@perches.com> > > When files are being added/moved/deleted and a patch contains an update to > the MAINTAINERS file, assume it's to update the MAINTAINERS file correctly > and do not emit the "does MAINTAINERS need updating?" message. > > Reported by many people. > > Signed-off-by: Joe Perches <joe@perches.com> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> > (cherry picked from e0d975b1b439c4fef58fbc306c542c94f48bb849) > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > scripts/checkpatch.pl | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index 95ba64f3a5..1c20c683e8 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -1389,6 +1389,12 @@ sub process { > } > } > > +# Check if MAINTAINERS is being updated. If so, there's probably no need to > +# emit the "does MAINTAINERS need updating?" message on file add/move/delete > + if ($line =~ /^\s*MAINTAINERS\s*\|/) { > + $reported_maintainer_file = 1; > + } > + > # Check for added, moved or deleted files > if (!$reported_maintainer_file && !$in_commit_log && > ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ || > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 95ba64f3a5..1c20c683e8 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1389,6 +1389,12 @@ sub process { } } +# Check if MAINTAINERS is being updated. If so, there's probably no need to +# emit the "does MAINTAINERS need updating?" message on file add/move/delete + if ($line =~ /^\s*MAINTAINERS\s*\|/) { + $reported_maintainer_file = 1; + } + # Check for added, moved or deleted files if (!$reported_maintainer_file && !$in_commit_log && ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||