diff for duplicates of <20180903164935.354711574@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index 54cc5c1..cc06be3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ ------------------ -From: Masami Hiramatsu <mhiramat at kernel.org> +From: Masami Hiramatsu <mhiramat@kernel.org> [ Upstream commit 82f4f3e69c5c29bce940dd87a2c0f16c51d48d17 ] diff --git a/a/content_digest b/N1/content_digest index 31ace51..0b6ead5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,5 +1,5 @@ "ref\020180903164934.171677301@linuxfoundation.org\0" - "From\0gregkh at linuxfoundation.org (Greg Kroah-Hartman)\0" + "From\0gregkh@linuxfoundation.org (Greg Kroah-Hartman)\0" "Subject\0[PATCH 4.4 30/80] selftests/ftrace: Add snapshot and tracing_on test case\0" "Date\0Mon, 3 Sep 2018 18:49:08 +0200\0" "\00:1\0" @@ -8,7 +8,7 @@ "\n" "------------------\n" "\n" - "From: Masami Hiramatsu <mhiramat at kernel.org>\n" + "From: Masami Hiramatsu <mhiramat@kernel.org>\n" "\n" "[ Upstream commit 82f4f3e69c5c29bce940dd87a2c0f16c51d48d17 ]\n" "\n" @@ -64,4 +64,4 @@ "+\n" +exit 0 -1ba95634691029546de464328f7de473517a5bf01c11130df656f3d35922e50d +1ab0f2fcd4fc5dd37ad87d615d2d4d45e1982a2b6ae9e7dd18c9998d8b1711a0
diff --git a/a/1.txt b/N2/1.txt index 54cc5c1..2db4d32 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ ------------------ -From: Masami Hiramatsu <mhiramat at kernel.org> +From: Masami Hiramatsu <mhiramat@kernel.org> [ Upstream commit 82f4f3e69c5c29bce940dd87a2c0f16c51d48d17 ] @@ -10,17 +10,17 @@ Add a testcase for checking snapshot and tracing_on relationship. This ensures that the snapshotting doesn't affect current tracing on/off settings. -Link: http://lkml.kernel.org/r/153149932412.11274.15289227592627901488.stgit at devbox +Link: http://lkml.kernel.org/r/153149932412.11274.15289227592627901488.stgit@devbox -Cc: Tom Zanussi <tom.zanussi at linux.intel.com> -Cc: Hiraku Toyooka <hiraku.toyooka at cybertrust.co.jp> -Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org> -Cc: Ingo Molnar <mingo at redhat.com> -Cc: Shuah Khan <shuah at kernel.org> -Cc: linux-kselftest at vger.kernel.org -Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org> -Signed-off-by: Sasha Levin <alexander.levin at microsoft.com> -Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org> +Cc: Tom Zanussi <tom.zanussi@linux.intel.com> +Cc: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp> +Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> +Cc: Ingo Molnar <mingo@redhat.com> +Cc: Shuah Khan <shuah@kernel.org> +Cc: linux-kselftest@vger.kernel.org +Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc | 28 ++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/a/content_digest b/N2/content_digest index 31ace51..cc727c9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,25 @@ "ref\020180903164934.171677301@linuxfoundation.org\0" - "From\0gregkh at linuxfoundation.org (Greg Kroah-Hartman)\0" + "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 4.4 30/80] selftests/ftrace: Add snapshot and tracing_on test case\0" "Date\0Mon, 3 Sep 2018 18:49:08 +0200\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" + stable@vger.kernel.org + Tom Zanussi <tom.zanussi@linux.intel.com> + Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp> + Masami Hiramatsu <mhiramat@kernel.org> + Ingo Molnar <mingo@redhat.com> + Shuah Khan <shuah@kernel.org> + linux-kselftest@vger.kernel.org + Steven Rostedt (VMware) <rostedt@goodmis.org> + " Sasha Levin <alexander.levin@microsoft.com>\0" "\00:1\0" "b\0" "4.4-stable review patch. If anyone has any objections, please let me know.\n" "\n" "------------------\n" "\n" - "From: Masami Hiramatsu <mhiramat at kernel.org>\n" + "From: Masami Hiramatsu <mhiramat@kernel.org>\n" "\n" "[ Upstream commit 82f4f3e69c5c29bce940dd87a2c0f16c51d48d17 ]\n" "\n" @@ -16,17 +27,17 @@ "relationship. This ensures that the snapshotting doesn't\n" "affect current tracing on/off settings.\n" "\n" - "Link: http://lkml.kernel.org/r/153149932412.11274.15289227592627901488.stgit at devbox\n" + "Link: http://lkml.kernel.org/r/153149932412.11274.15289227592627901488.stgit@devbox\n" "\n" - "Cc: Tom Zanussi <tom.zanussi at linux.intel.com>\n" - "Cc: Hiraku Toyooka <hiraku.toyooka at cybertrust.co.jp>\n" - "Signed-off-by: Masami Hiramatsu <mhiramat at kernel.org>\n" - "Cc: Ingo Molnar <mingo at redhat.com>\n" - "Cc: Shuah Khan <shuah at kernel.org>\n" - "Cc: linux-kselftest at vger.kernel.org\n" - "Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org>\n" - "Signed-off-by: Sasha Levin <alexander.levin at microsoft.com>\n" - "Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>\n" + "Cc: Tom Zanussi <tom.zanussi@linux.intel.com>\n" + "Cc: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>\n" + "Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>\n" + "Cc: Ingo Molnar <mingo@redhat.com>\n" + "Cc: Shuah Khan <shuah@kernel.org>\n" + "Cc: linux-kselftest@vger.kernel.org\n" + "Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>\n" + "Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>\n" + "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "---\n" " tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc | 28 ++++++++++++++\n" " 1 file changed, 28 insertions(+)\n" @@ -64,4 +75,4 @@ "+\n" +exit 0 -1ba95634691029546de464328f7de473517a5bf01c11130df656f3d35922e50d +84b77fa30001a0716593f003ff5e1f20d6f068f7fa54fd6d8cf624e0581bef9c
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.