The patch titled
Subject: tools/testing/selftests/sysctl/sysctl.sh: ignore diff output on verify_diff_w()
has been removed from the -mm tree. Its filename was
test_sysctl-ignore-diff-output-on-verify_diff_w.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Subject: tools/testing/selftests/sysctl/sysctl.sh: ignore diff output on verify_diff_w()
When verify_diff_w() is used we care about the result, not the verbose
output, and although we use -q, that still gives us a chatty message about
if the files differ or not. Since verify_diff_w() uses stdinput the
chatty message says whether or not "-" matches the target file, and this
just seems rather odd. Better to just ignore that messsage all together,
what we really care about i sthe results, the return value and we check
for that.
Link: http://lkml.kernel.org/r/20190320222831.8243-4-mcgrof@xxxxxxxxxx
Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Eric Sandeen <sandeen@xxxxxxxxxx>
Cc: Eric Sandeen <sandeen@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/sysctl/sysctl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/tools/testing/selftests/sysctl/sysctl.sh~test_sysctl-ignore-diff-output-on-verify_diff_w
+++ a/tools/testing/selftests/sysctl/sysctl.sh
@@ -179,7 +179,7 @@ verify()
verify_diff_w()
{
- echo "$TEST_STR" | diff -q -w -u - $1
+ echo "$TEST_STR" | diff -q -w -u - $1 > /dev/null
return $?
}
_
Patches currently in -mm which might be from mcgrof@xxxxxxxxxx are
