diff for duplicates of <20180924113125.269769392@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index 3d86540..de1bdc8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ ------------------ -From: John Stultz <john.stultz at linaro.org> +From: John Stultz <john.stultz@linaro.org> [ Upstream commit 1416270f4a1ae83ea84156ceba19a66a8f88be1f ] diff --git a/a/content_digest b/N1/content_digest index 731d5e5..0f3d01d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,5 +1,5 @@ "ref\020180924113103.999624566@linuxfoundation.org\0" - "From\0gregkh at linuxfoundation.org (Greg Kroah-Hartman)\0" + "From\0gregkh@linuxfoundation.org (Greg Kroah-Hartman)\0" "Subject\0[PATCH 4.18 218/235] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress\0" "Date\0Mon, 24 Sep 2018 13:53:24 +0200\0" "\00:1\0" @@ -8,7 +8,7 @@ "\n" "------------------\n" "\n" - "From: John Stultz <john.stultz at linaro.org>\n" + "From: John Stultz <john.stultz@linaro.org>\n" "\n" "[ Upstream commit 1416270f4a1ae83ea84156ceba19a66a8f88be1f ]\n" "\n" @@ -56,4 +56,4 @@ " \t\treturn ksft_exit_fail();\n" " \t}" -d559ee8f20bac20761de1acb66106f16a593c1ceefad8d76ac13e78e4ecf9eac +16b8dcc9b1720e08ab977a98a82c43be42a260b2c4acd31310407adb7d24bce8
diff --git a/a/1.txt b/N2/1.txt index 3d86540..7054950 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ ------------------ -From: John Stultz <john.stultz at linaro.org> +From: John Stultz <john.stultz@linaro.org> [ Upstream commit 1416270f4a1ae83ea84156ceba19a66a8f88be1f ] @@ -14,23 +14,23 @@ incorrect. Thus, this patch checks to see if the clock was being adjusted when we fail so that we don't cause false negatives. -Cc: Thomas Gleixner <tglx at linutronix.de> -Cc: Ingo Molnar <mingo at kernel.org> -Cc: Miroslav Lichvar <mlichvar at redhat.com> -Cc: Richard Cochran <richardcochran at gmail.com> -Cc: Prarit Bhargava <prarit at redhat.com> -Cc: Stephen Boyd <sboyd at kernel.org> -Cc: Shuah Khan <shuah at kernel.org> -Cc: linux-kselftest at vger.kernel.org -Suggested-by: Miroslav Lichvar <mlichvar at redhat.com> -Signed-off-by: John Stultz <john.stultz at linaro.org> -Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org> +Cc: Thomas Gleixner <tglx@linutronix.de> +Cc: Ingo Molnar <mingo@kernel.org> +Cc: Miroslav Lichvar <mlichvar@redhat.com> +Cc: Richard Cochran <richardcochran@gmail.com> +Cc: Prarit Bhargava <prarit@redhat.com> +Cc: Stephen Boyd <sboyd@kernel.org> +Cc: Shuah Khan <shuah@kernel.org> +Cc: linux-kselftest@vger.kernel.org +Suggested-by: Miroslav Lichvar <mlichvar@redhat.com> +Signed-off-by: John Stultz <john.stultz@linaro.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- v2: Widened the checks to look for other clock adjustments that could happen, as suggested by Miroslav v3: Fixed up commit message -Signed-off-by: Sasha Levin <alexander.levin at microsoft.com> -Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org> +Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- tools/testing/selftests/timers/raw_skew.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/a/content_digest b/N2/content_digest index 731d5e5..1ce0f22 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,27 @@ "ref\020180924113103.999624566@linuxfoundation.org\0" - "From\0gregkh at linuxfoundation.org (Greg Kroah-Hartman)\0" + "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 4.18 218/235] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress\0" "Date\0Mon, 24 Sep 2018 13:53:24 +0200\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" + stable@vger.kernel.org + Thomas Gleixner <tglx@linutronix.de> + Ingo Molnar <mingo@kernel.org> + Miroslav Lichvar <mlichvar@redhat.com> + Richard Cochran <richardcochran@gmail.com> + Prarit Bhargava <prarit@redhat.com> + Stephen Boyd <sboyd@kernel.org> + Shuah Khan <shuah@kernel.org> + linux-kselftest@vger.kernel.org + John Stultz <john.stultz@linaro.org> + " Sasha Levin <alexander.levin@microsoft.com>\0" "\00:1\0" "b\0" "4.18-stable review patch. If anyone has any objections, please let me know.\n" "\n" "------------------\n" "\n" - "From: John Stultz <john.stultz at linaro.org>\n" + "From: John Stultz <john.stultz@linaro.org>\n" "\n" "[ Upstream commit 1416270f4a1ae83ea84156ceba19a66a8f88be1f ]\n" "\n" @@ -20,23 +33,23 @@ "Thus, this patch checks to see if the clock was being adjusted\n" "when we fail so that we don't cause false negatives.\n" "\n" - "Cc: Thomas Gleixner <tglx at linutronix.de>\n" - "Cc: Ingo Molnar <mingo at kernel.org>\n" - "Cc: Miroslav Lichvar <mlichvar at redhat.com>\n" - "Cc: Richard Cochran <richardcochran at gmail.com>\n" - "Cc: Prarit Bhargava <prarit at redhat.com>\n" - "Cc: Stephen Boyd <sboyd at kernel.org>\n" - "Cc: Shuah Khan <shuah at kernel.org>\n" - "Cc: linux-kselftest at vger.kernel.org\n" - "Suggested-by: Miroslav Lichvar <mlichvar at redhat.com>\n" - "Signed-off-by: John Stultz <john.stultz at linaro.org>\n" - "Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>\n" + "Cc: Thomas Gleixner <tglx@linutronix.de>\n" + "Cc: Ingo Molnar <mingo@kernel.org>\n" + "Cc: Miroslav Lichvar <mlichvar@redhat.com>\n" + "Cc: Richard Cochran <richardcochran@gmail.com>\n" + "Cc: Prarit Bhargava <prarit@redhat.com>\n" + "Cc: Stephen Boyd <sboyd@kernel.org>\n" + "Cc: Shuah Khan <shuah@kernel.org>\n" + "Cc: linux-kselftest@vger.kernel.org\n" + "Suggested-by: Miroslav Lichvar <mlichvar@redhat.com>\n" + "Signed-off-by: John Stultz <john.stultz@linaro.org>\n" + "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "---\n" "v2: Widened the checks to look for other clock adjustments that\n" " could happen, as suggested by Miroslav\n" "v3: Fixed up commit message\n" - "Signed-off-by: Sasha Levin <alexander.levin at microsoft.com>\n" - "Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.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/timers/raw_skew.c | 5 +++++\n" " 1 file changed, 5 insertions(+)\n" @@ -56,4 +69,4 @@ " \t\treturn ksft_exit_fail();\n" " \t}" -d559ee8f20bac20761de1acb66106f16a593c1ceefad8d76ac13e78e4ecf9eac +26c91e2146f3c7a92126276d71f4fe4b61eb9e15d4bd7551aab1240b2e5dec64
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.