Re: /usr/src/sys/net/if_epair.c:181:6: error: ...

From: bob prohaska <fbsd_at_www.zefox.net>
Date: Wed, 23 Mar 2022 18:24:46 UTC 
On Wed, Mar 23, 2022 at 05:51:18PM +0100, Kristof Provost wrote:
> 
> 
> > On 23 Mar 2022, at 16:59, bob prohaska <fbsd@www.zefox.net> wrote:
> > 
> > ???On Wed, Mar 23, 2022 at 11:51:17AM +0100, Kristof Provost wrote:
> >> 
> >> 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).
> >> 
> > 
> > Trying it now.
> > 
> > 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
> > 
> > Running make buildkernel -DWITH_META_MODE anyway to see if anything 
> > else goes wrong. Half an hour in so far and no errors. If it fails 
> > I'll delete the altered files, run svnlite up again and try over. 
> > 
> > Thanks to all for the speedy replies!
> 
> I???m a little confused by that failed hunk. What version are you patching? The patch should apply cleanly on stable/12. 

svnlite info reports
Path: /usr/src
Working Copy Root Path: /usr/src
URL: svn://svn.freebsd.org/base/stable/12
Relative URL: ^/stable/12
Repository Root: svn://svn.freebsd.org/base
Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Revision: 371773
Node Kind: directory
Schedule: normal
Last Changed Author: royger
Last Changed Rev: 371773
Last Changed Date: 2022-03-23 06:53:19 -0700 (Wed, 23 Mar 2022)

The kernel compiled and installed without error. After sending this
email I'll attempt to reboot.

Thanks for your help!

bob prohaska