diff for duplicates of <1455602117.4046.45.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 600f860..a63dbfd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On Tue, 2016-02-16 at 00:47 -0500, green at linuxhacker.ru wrote: +On Tue, 2016-02-16 at 00:47 -0500, green@linuxhacker.ru wrote: > From: Oleg Drokin <green@linuxhacker.ru> > > This pacifies checkpatch amongst other things, also is shorter to write @@ -7,20 +7,20 @@ On Tue, 2016-02-16 at 00:47 -0500, green at linuxhacker.ru wrote: > diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c [] > @@ -244,11 +244,11 @@ void cfs_print_to_console(struct ptldebug_header *hdr, int mask, -> ? } -> ? -> ? if ((mask & D_CONSOLE) != 0) { +> } +> +> if ((mask & D_CONSOLE) != 0) { > - printk("%s%s: %.*s", ptype, prefix, len, buf); > + pr_err("%s%s: %.*s", ptype, prefix, len, buf); -> ? } else { +> } else { > - printk("%s%s: %d:%d:(%s:%d:%s()) %.*s", ptype, prefix, -> - ???????hdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num, -> - ???????fn, len, buf); +> - hdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num, +> - fn, len, buf); > + pr_warn("%s%s: %d:%d:(%s:%d:%s()) %.*s", ptype, prefix, > + hdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num, > + fn, len, buf); -> ? } -> ?} +> } +> } This breaks the currently correct output. diff --git a/a/content_digest b/N1/content_digest index 2168951..8f5a647 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01455601637-3847710-1-git-send-email-green@linuxhacker.ru\0" "ref\01455601637-3847710-44-git-send-email-green@linuxhacker.ru\0" "From\0Joe Perches <joe@perches.com>\0" - "Subject\0[lustre-devel] [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_<level>\0" + "Subject\0Re: [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_<level>\0" "Date\0Mon, 15 Feb 2016 21:55:17 -0800\0" "To\0green@linuxhacker.ru" Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -11,7 +11,7 @@ " Lustre Development List <lustre-devel@lists.lustre.org>\0" "\00:1\0" "b\0" - "On Tue, 2016-02-16 at 00:47 -0500, green at linuxhacker.ru wrote:\n" + "On Tue, 2016-02-16 at 00:47 -0500, green@linuxhacker.ru wrote:\n" "> From: Oleg Drokin <green@linuxhacker.ru>\n" "> \n" "> This pacifies checkpatch amongst other things, also is shorter to write\n" @@ -20,20 +20,20 @@ "> diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c\n" "[]\n" "> @@ -244,11 +244,11 @@ void cfs_print_to_console(struct ptldebug_header *hdr, int mask,\n" - "> ?\t}\n" - "> ?\n" - "> ?\tif ((mask & D_CONSOLE) != 0) {\n" + "> \302\240\t}\n" + "> \302\240\n" + "> \302\240\tif ((mask & D_CONSOLE) != 0) {\n" "> -\t\tprintk(\"%s%s: %.*s\", ptype, prefix, len, buf);\n" "> +\t\tpr_err(\"%s%s: %.*s\", ptype, prefix, len, buf);\n" - "> ?\t} else {\n" + "> \302\240\t} else {\n" "> -\t\tprintk(\"%s%s: %d:%d:(%s:%d:%s()) %.*s\", ptype, prefix,\n" - "> -\t\t???????hdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num,\n" - "> -\t\t???????fn, len, buf);\n" + "> -\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240hdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num,\n" + "> -\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240fn, len, buf);\n" "> +\t\tpr_warn(\"%s%s: %d:%d:(%s:%d:%s()) %.*s\", ptype, prefix,\n" "> +\t\t\thdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num,\n" "> +\t\t\tfn, len, buf);\n" - "> ?\t}\n" - "> ?}\n" + "> \302\240\t}\n" + "> \302\240}\n" "\n" "This breaks the currently correct output.\n" "\n" @@ -55,4 +55,4 @@ "\t\tptype = KERN_INFO;\n" "\t}" -f4ccb4c2630a3f7f953d14c5ab754573447225676605fdbc4cf32008bd81e22f +71c1df362fb4444c59ce4863e8ac331328e8c58bb06f52694691b55bba926570
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.