FreeBSD/src 7a83fedtests/sys/net if_lagg_test.sh

tests/if_lagg_test: unskip 'witness' testcase

This testcase passes consistently (in 100+ runs) now.

Signed-off-by:  Siva Mahadevan <me at svmhdvn.name>
PR:             244163, 251726
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
DeltaFile
+0-3tests/sys/net/if_lagg_test.sh
+0-31 files

FreeBSD/src e93e57dtests/sys/netinet fibs_test.sh

tests/fibs_test: unskip udp_dontroute6 testcase

This test now consistently passes (300+ consecutive runs).

Signed-off-by:  Siva Mahadevan <me at svmhdvn.name>
PR:             244172
Sponsored by:   The FreeBSD Foundation
DeltaFile
+0-3tests/sys/netinet/fibs_test.sh
+0-31 files

FreeBSD/src 012f1e4sys/dev/xilinx axidma.c

axidma(4): switch interrupt type.

Switch interrupt type to NET so that it enters net epoch during
interrupt service routine.

Sponsored by:   CHERI Research Centre
DeltaFile
+1-1sys/dev/xilinx/axidma.c
+1-11 files

FreeBSD/src 00352efetc/mtree BSD.include.dist

etc/mtree/BSD.include.dist: Remove atf tags

When building with WITHOUT_TESTS this result in a FreeBSD-atf-dev
package with only this directory and a dependency on FreeBSD-atf which
doesn't exists.

Reviewed by:    ivy
Differential Revision:  https://reviews.freebsd.org/D54236
Fixes:          436618a427b4 ("etc/mtree: Add package tags for /usr/include")
Sponsored by:   Beckhoff Automation GMbH & Co. KG
DeltaFile
+2-2etc/mtree/BSD.include.dist
+2-21 files

FreeBSD/src 1fbdb14etc/mtree BSD.include.dist

etc/mtree/BSD.include.dist: Remove bsnmp tags

When building with WITHOUT_BSNMP this result in a FreeBSD-bsnmp-dev
package with only this directory and a dependency on FreeBSD-bsnmp which
doesn't exists.

Reviewed by:    ivy
Differential Revision:  https://reviews.freebsd.org/D54235
Fixes:          436618a427b4 ("etc/mtree: Add package tags for /usr/include")
Sponsored by:   Beckhoff Automation GMbH & Co. KG
DeltaFile
+1-1etc/mtree/BSD.include.dist
+1-11 files

FreeBSD/src 9c844b6contrib/blocklist/bin blacklistd.c

blocklist: blacklist: Chase recent upstream changes

Upstream fixed a couple of bugs:

1. Only attempt to restore the blocking rules if the database file
   exists.  Otherwise, when the service starts for the first time, it
   fails (PR 258411).

2. Revert a commit that removed a call to close(bi->bi_fd), preventing
   the descriptor from being deleted.

PR:             258411
PR:             291680
MFC after:      1 week
DeltaFile
+17-13contrib/blocklist/bin/blacklistd.c
+17-131 files

FreeBSD/src 2755418share/examples/kld/khelp h_example.c

khelp: make the module compile again

PR:             291165
MFC after:      1 week
DeltaFile
+2-0share/examples/kld/khelp/h_example.c
+2-01 files

FreeBSD/src e5fbddecontrib/ofed/libibverbs alloca.h cmd.c

ofed/libibverbs: remove no longer needed local alloca.h

(cherry picked from commit 70edd3c126a591dec129958d3e103521de84746d)
DeltaFile
+0-18contrib/ofed/libibverbs/alloca.h
+0-1contrib/ofed/libibverbs/cmd.c
+0-1contrib/ofed/libibverbs/compat-1_0.c
+0-1contrib/ofed/libibverbs/device.c
+0-214 files

FreeBSD/src 0cfd862contrib/ofed/libibverbs config.h

ofed/libibverbs: remove strdupa() hack from config.h

(cherry picked from commit 6a75e3951506c12b42428a47710d07cadcdd723e)
DeltaFile
+3-3contrib/ofed/libibverbs/config.h
+3-31 files

FreeBSD/src 242f545include string.h, lib/libc/string strdup.3 Makefile.inc

libc/string: add strdupa(3) and strndupa(3)

(cherry picked from commit a98e5d78500193dc7aa352e1f60ac2c6529e2c38)
DeltaFile
+33-1lib/libc/string/strdup.3
+28-0include/string.h
+3-1lib/libc/string/Makefile.inc
+64-23 files

FreeBSD/src 90c3706contrib/ofed/libibverbs alloca.h compat-1_0.c

ofed/libibverbs: remove no longer needed local alloca.h

(cherry picked from commit 70edd3c126a591dec129958d3e103521de84746d)
DeltaFile
+0-18contrib/ofed/libibverbs/alloca.h
+0-1contrib/ofed/libibverbs/compat-1_0.c
+0-1contrib/ofed/libibverbs/device.c
+0-1contrib/ofed/libibverbs/cmd.c
+0-214 files

FreeBSD/src 477c464lib/libc/string Makefile.inc

libc/string: put source files list one item per line

(cherry picked from commit 98b7cca0186dddfc775582a32b39052d05840858)
DeltaFile
+121-23lib/libc/string/Makefile.inc
+121-231 files

FreeBSD/src dd1a76fcontrib/ofed/libibverbs config.h

ofed/libibverbs: remove strdupa() hack from config.h

(cherry picked from commit 6a75e3951506c12b42428a47710d07cadcdd723e)
DeltaFile
+3-3contrib/ofed/libibverbs/config.h
+3-31 files

FreeBSD/src b2e649ainclude string.h, lib/libc/string strdup.3 Makefile.inc

libc/string: add strdupa(3) and strndupa(3)

(cherry picked from commit a98e5d78500193dc7aa352e1f60ac2c6529e2c38)
DeltaFile
+33-1lib/libc/string/strdup.3
+28-0include/string.h
+3-1lib/libc/string/Makefile.inc
+64-23 files

FreeBSD/src 9b94342sys/kern kern_proc.c

proc_dtor(): style improvements

Drop not needed cast.
Group sigchld state check as single KASSERT condition.
Remove useless comment.

Reviewed by:    des, olce
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D54234
DeltaFile
+3-5sys/kern/kern_proc.c
+3-51 files

FreeBSD/src 094626dsys/dev/liquidio lio_main.c lio_ioctl.c

lio: Avoid out-of-bounds read or write MAC address

While here, replace loop copying the MAC address with memcpy() for
better readability.

Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54177
DeltaFile
+4-6sys/dev/liquidio/lio_main.c
+2-2sys/dev/liquidio/lio_ioctl.c
+6-82 files

FreeBSD/src c13157bsbin/shutdown shutdown.8

shutdown(8): Document additional formats supported by the code.

(cherry picked from commit f9500e75791cf793904c80ca4a52433afd585a23)
DeltaFile
+47-15sbin/shutdown/shutdown.8
+47-151 files

FreeBSD/src 5239520contrib/blocklist/bin blocklistd.c

MFV: Import blocklist 2025-12-15 (8a4b011)

Merge commit 'bfef098f924950a085927b1e7dd6c6db4e651c5c'

Changes:

https://github.com/zoulasc/blocklist/compare/ff13526...8a4b011

PR:             258411
PR:             291680
MFC after:      1 week
DeltaFile
+17-13contrib/blocklist/bin/blocklistd.c
+17-131 files

FreeBSD/src bfef098bin blocklistd.c

Vendor import of blocklist 2025-12-15 (8a4b011)

Upstream hash 8a4b011dec375ee695b1a72f1ea57394670f359d.

Obtained from:  https://github.com/zoulasc/blocklist
DeltaFile
+17-13bin/blocklistd.c
+17-131 files

FreeBSD/src 715cc25contrib/blocklist FreeBSD-upgrade freebsd-changes.sh

blocklist: Add vendor import instructions

Add vendor import instructions for blocklist.

It includes a "freebsd-changes.sh" script that takes care of adapting
paths and functions into FreeBSD.

Reviewed by:    emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D49510
DeltaFile
+97-0contrib/blocklist/FreeBSD-upgrade
+18-0contrib/blocklist/freebsd-changes.sh
+115-02 files

FreeBSD/src 03603dbusr.sbin/acpi/acpidump acpidump.8

acpidump.8: formatting fix

Reported by:    Marcin Cieslak
DeltaFile
+1-1usr.sbin/acpi/acpidump/acpidump.8
+1-11 files

FreeBSD/src 5bd8397sys/dev/thunderbolt nhi_pci.c tb_pcib.c

thunderbolt: Remove PNP info

So it isn't matched by devmatch(8) and automatically loaded. The PNP
info will be readded once the USB4 driver is more complete.

PR:             290827
Reported by:    fuz, Marco Siedentopf <siedentm at me.com>
Fixes:  2ed9833791f2 (thunderbolt: Import USB4 code)
Sponsored by:   The FreeBSD Foundation
DeltaFile
+0-2sys/dev/thunderbolt/nhi_pci.c
+0-2sys/dev/thunderbolt/tb_pcib.c
+0-42 files

FreeBSD/src f1b50f2cddl/contrib/opensolaris/tools/ctf/cvt barrier.c barrier.h

ctfmerge: fix segfault when building on macOS

The barrier code was using semaphores which have been deprecated in
macOS and not working at all, causing a race condition. Since macOS
does not have pthread_barrier_*(), this change uses a condition
variable instead.

PR:             290958
Reported by:    wosch
Reviewed by:    imp, markj
Differential Revision:  https://reviews.freebsd.org/D54018

(cherry picked from commit 732b4aa05d78ca6831d02e67a43f34ad104f4f01)
DeltaFile
+3-23cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c
+2-7cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h
+5-302 files

FreeBSD/src 2bf082dcddl/contrib/opensolaris/tools/ctf/cvt barrier.c barrier.h

ctfmerge: fix segfault when building on macOS

The barrier code was using semaphores which have been deprecated in
macOS and not working at all, causing a race condition. Since macOS
does not have pthread_barrier_*(), this change uses a condition
variable instead.

PR:             290958
Reported by:    wosch
Reviewed by:    imp, markj
Differential Revision:  https://reviews.freebsd.org/D54018

(cherry picked from commit 732b4aa05d78ca6831d02e67a43f34ad104f4f01)
DeltaFile
+3-23cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c
+2-7cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h
+5-302 files

FreeBSD/src 7cba272cddl/contrib/opensolaris/tools/ctf/cvt barrier.c barrier.h

ctfmerge: fix segfault when building on macOS

The barrier code was using semaphores which have been deprecated in
macOS and not working at all, causing a race condition. Since macOS
does not have pthread_barrier_*(), this change uses a condition
variable instead.

PR:             290958
Reported by:    wosch
Reviewed by:    imp, markj
Differential Revision:  https://reviews.freebsd.org/D54018

(cherry picked from commit 732b4aa05d78ca6831d02e67a43f34ad104f4f01)
DeltaFile
+3-23cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c
+2-7cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h
+5-302 files

FreeBSD/src 3daae1asbin/ipfw ipfw.8 ipfw2.c, sys/netpfil/ipfw ip_fw_bpf.c ip_fw_log.c

ipfw: create a bpf tap point for every log rule

Dynamically allocate bpf tap points for every rule that has "log".
The name is "ipfw%u", where %u is substituted to the rule number.
The default catch all "ipfw0" tap still exists for compatibility
and it will catch packets in case if there are no bpf listeners
on a per-rule tap.

Reviewed by:            ae
Differential Revision:  https://reviews.freebsd.org/D53877
DeltaFile
+98-31sys/netpfil/ipfw/ip_fw_bpf.c
+22-9sbin/ipfw/ipfw.8
+3-27sys/netpfil/ipfw/ip_fw_log.c
+4-3sbin/ipfw/ipfw2.c
+4-3sys/netpfil/ipfw/ip_fw_private.h
+5-0sys/netpfil/ipfw/ip_fw_sockopt.c
+136-734 files not shown
+140-7710 files

FreeBSD/src 1615effsys/dev/usb usb_pf.c usb_bus.h, sys/netinet6 in6.c

usb: don't create ifnet(9) for usbus devices

Differential Revision:  https://reviews.freebsd.org/D54063
DeltaFile
+13-176sys/dev/usb/usb_pf.c
+0-23usr.sbin/usbdump/usbdump.c
+1-1sys/dev/usb/usb_bus.h
+0-1sys/netinet6/in6.c
+14-2014 files

FreeBSD/src ddf4f9elibexec/rc rc.conf, libexec/rc/rc.d ipfw

ipfw: create "ipfw0" and "ipfwlog0" bpf tapping points without ifnet(9)

As a free bonus the tapping points are now able to match packet direction.

Reviewed by:            ae
Differential Revision:  https://reviews.freebsd.org/D53875
DeltaFile
+26-120sys/netpfil/ipfw/ip_fw_bpf.c
+9-29sbin/ipfw/ipfw.8
+0-10libexec/rc/rc.d/ipfw
+0-1libexec/rc/rc.conf
+35-1604 files

FreeBSD/src 1c5021fsbin/ifconfig ifclone.c

ifconfig: print warning and return success on ipfw0, ipfwlog0 cloning

This should provide people a chance to remove ipfw0 and ipfwlog0 from
cloned_interfaces in their rc.conf during FreeBSD 16.x lifetime.

Differential Revision:  https://reviews.freebsd.org/D53876
DeltaFile
+9-0sbin/ifconfig/ifclone.c
+9-01 files

FreeBSD/src efc8353usr.sbin/usbdump usbdump.c

usbdump: remove some FreeBSD 9.x code
DeltaFile
+0-19usr.sbin/usbdump/usbdump.c
+0-191 files