Date: Wed, 23 Mar 2022 17:51:18 +0100 From: Kristof Provost <kp@freebsd.org> To: bob prohaska <fbsd@www.zefox.net> Cc: Mark Millard <marklmi@yahoo.com>, grembo@freebsd.org, Free BSD <freebsd-arm@freebsd.org> Subject: Re: /usr/src/sys/net/if_epair.c:181:6: error: ... Message-ID: <22389953-442F-4915-8797-32D1FF577F44@freebsd.org> In-Reply-To: <20220323155947.GA96051@www.zefox.net> References: <20220323155947.GA96051@www.zefox.net>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 23 Mar 2022, at 16:59, bob prohaska <fbsd@www.zefox.net> wrote: >=20 > =EF=BB=BFOn Wed, Mar 23, 2022 at 11:51:17AM +0100, Kristof Provost wrote: >>=20 >> Can you try the attached patch? I???m not going to argue with the MI code= about the atomic_testandclear_int, but instead revert the new if_epair code= (in stable/12 only, of course). >>=20 >=20 > Trying it now. >=20 > Patch reported: > Patching file sys/net/if_epair.c using Plan A... > Hunk #1 succeeded at 2. > Hunk #2 failed at 37. > Hunk #3 succeeded at 61. > Hunk #4 succeeded at 78. > Hunk #5 succeeded at 201. > Hunk #6 succeeded at 517. > Hunk #7 succeeded at 540. > Hunk #8 succeeded at 701. > Hunk #9 succeeded at 791. > Hunk #10 succeeded at 809. > Hunk #11 succeeded at 862. > Hunk #12 succeeded at 876. > Hunk #13 succeeded at 904. > Hunk #14 succeeded at 932. > Hunk #15 succeeded at 947. > Hunk #16 succeeded at 975. > Hunk #17 succeeded at 999. > Hunk #18 succeeded at 1010. > Hunk #19 succeeded at 1061. > 1 out of 19 hunks failed--saving rejects to sys/net/if_epair.c.rej >=20 > Running make buildkernel -DWITH_META_MODE anyway to see if anything=20 > else goes wrong. Half an hour in so far and no errors. If it fails=20 > I'll delete the altered files, run svnlite up again and try over.=20 >=20 > Thanks to all for the speedy replies! I=E2=80=99m a little confused by that failed hunk. What version are you patc= hing? The patch should apply cleanly on stable/12.=20 Kristof
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?22389953-442F-4915-8797-32D1FF577F44>