diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:36:09 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:36:09 +0200 |
commit | 5ecb11dd892f443d4900292edaba88a26efee8fe (patch) | |
tree | d92c07b74431f862289a86230c66e2ef790f8980 /tools/testing/selftests/net/af_unix/test_unix_oob.c | |
parent | 7c783601a3bc22a54cce0fb650259a983c8cafba (diff) | |
parent | 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 (diff) |
Merge 5.15-rc3 into tty-next
We need the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/net/af_unix/test_unix_oob.c')
-rw-r--r-- | tools/testing/selftests/net/af_unix/test_unix_oob.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/testing/selftests/net/af_unix/test_unix_oob.c b/tools/testing/selftests/net/af_unix/test_unix_oob.c index 0f3e3763f4f8..3dece8b29253 100644 --- a/tools/testing/selftests/net/af_unix/test_unix_oob.c +++ b/tools/testing/selftests/net/af_unix/test_unix_oob.c @@ -271,8 +271,9 @@ main(int argc, char **argv) read_oob(pfd, &oob); if (!signal_recvd || len != 127 || oob != '%' || atmark != 1) { - fprintf(stderr, "Test 3 failed, sigurg %d len %d OOB %c ", - "atmark %d\n", signal_recvd, len, oob, atmark); + fprintf(stderr, + "Test 3 failed, sigurg %d len %d OOB %c atmark %d\n", + signal_recvd, len, oob, atmark); die(1); } |