The patch titled
Subject: checkpatch: report the right line # when using --emacs and --file
has been removed from the -mm tree. Its filename was
checkpatch-report-the-right-line-when-using-emacs-and-file.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: checkpatch: report the right line # when using --emacs and --file
commit 34d8815f9512 ("checkpatch: add --showfile to allow input via pipe
to show filenames") broke the --emacs with --file option.
Fix it.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
scripts/checkpatch.pl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff -puN scripts/checkpatch.pl~checkpatch-report-the-right-line-when-using-emacs-and-file scripts/checkpatch.pl
--- a/scripts/checkpatch.pl~checkpatch-report-the-right-line-when-using-emacs-and-file
+++ a/scripts/checkpatch.pl
@@ -2166,7 +2166,11 @@ sub process {
if ($showfile) {
$prefix = "$realfile:$realline: "
} elsif ($emacs) {
- $prefix = "$filename:$linenr: ";
+ if ($file) {
+ $prefix = "$filename:$realline: ";
+ } else {
+ $prefix = "$filename:$linenr: ";
+ }
}
if ($found_file) {
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
