Shawn Webb c454fe6a2b Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master ... Conflicts: lib/libclang_rt/Makefile.inc (unresolved) lib/libprocstat/Makefile (unresolved) share/mk/bsd.opts.mk (unresolved) stand/defs.mk (unresolved) targets/pseudo/bootstrap-tools/Makefile (unresolved)		2024-11-12 12:45:21 -07:00
..
compat/opensolaris
contrib/opensolaris	dtrace tests: Add a test case which validates FBT probe arguments	2024-09-19 09:22:03 +00:00
lib	Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master	2024-11-12 12:45:21 -07:00
sbin	Merge branch 'freebsd/current/main' into hardened/current/master	2024-09-09 12:01:37 -06:00
share	zfs: merge openzfs/zfs@b10992582	2024-10-11 08:43:49 +02:00
tests
usr.bin	zstream: avoid absolute symlink	2024-10-26 08:53:16 -04:00
usr.libexec	Remove residual blank line at start of Makefile	2024-07-15 16:43:39 -06:00
usr.sbin	manuals: Fix "skipping end of block" .El errors	2024-10-07 15:37:47 -03:00
Makefile
Makefile.inc