Script '/data/test/perform/bin/cvsbuild.pl -h root@ot14 -d 2025-02-09T21:10:25Z -P /home/bluhm/sys-tcp-input-solock.diff align' started at 2025-02-13T12:49:43Z.
Command 'ssh root@ot14 sysctl kern.version hw.machine hw.ncpu hw.ncpuonline' started.
Command 'ssh root@ot14 sysctl kern.version hw.machine hw.ncpu hw.ncpuonline' finished.
Command 'ssh root@ot14 cd /usr/src && cvs -qR up -C sys' started.
(Locally modified if.c moved to .#if.c.1.726)
U sys/net/if.c
(Locally modified if.h moved to .#if.h.1.217)
U sys/net/if.h
(Locally modified if_var.h moved to .#if_var.h.1.135)
U sys/net/if_var.h
(Locally modified ifq.c moved to .#ifq.c.1.56)
U sys/net/ifq.c
(Locally modified ip_input.c moved to .#ip_input.c.1.403)
U sys/netinet/ip_input.c
(Locally modified ip6_input.c moved to .#ip6_input.c.1.267)
U sys/netinet6/ip6_input.c
Command 'ssh root@ot14 cd /usr/src && cvs -qR up -C sys' finished.
Command 'ssh root@ot14 cd /usr/src/sys && patch -ENufF0 -p0' started.
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: netinet/tcp_input.c
|===================================================================
|RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/tcp_input.c,v
|diff -u -p -r1.430 tcp_input.c
|--- netinet/tcp_input.c	10 Feb 2025 15:06:57 -0000	1.430
|+++ netinet/tcp_input.c	13 Feb 2025 08:56:49 -0000
--------------------------
Patching file netinet/tcp_input.c using Plan A...
Hunk #1 succeeded at 604.
Hunk #2 succeeded at 641.
Hunk #3 succeeded at 729.
Hunk #4 succeeded at 737.
Hunk #5 succeeded at 847.
Hunk #6 succeeded at 1023.
Hunk #7 succeeded at 1074.
Hunk #8 succeeded at 1268.
Hunk #9 succeeded at 2074.
Hunk #10 succeeded at 2104.
Hunk #11 succeeded at 2140.
Hunk #12 succeeded at 2152.
Hunk #13 succeeded at 3558 (offset 2 lines).
Hunk #14 succeeded at 3572 (offset 2 lines).
Hunk #15 succeeded at 3713 (offset 2 lines).
Hunk #16 succeeded at 3726 (offset 2 lines).
Hunk #17 failed at 3831.
Hunk #18 succeeded at 3986 (offset -19 lines).
1 out of 18 hunks failed--saving rejects to netinet/tcp_input.c.rej
done
Command 'ssh root@ot14 cd /usr/src/sys && patch -ENufF0 -p0' failed: 256 at /data/test/perform/bin/Machine.pm line 187.
Command 'ssh root@ot14 cd /usr/src/sys && patch -ENufF0 -p0' failed: 256 at /data/test/perform/bin/Machine.pm line 187.