Shawn Webb 2226d61047 Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master ... Conflicts: bin/cat/cat.c (unresolved) lib/csu/aarch64/crt1_c.c (unresolved) lib/csu/amd64/crt1_c.c (unresolved) lib/csu/i386/crt1_c.c (unresolved) lib/csu/powerpc64/crt1_c.c (unresolved) lib/csu/powerpc64/reloc.c (unresolved) lib/csu/riscv/crt1_c.c (unresolved) lib/libc/gen/auxv.3 (unresolved) lib/libcasper/services/cap_net/cap_net.3 (unresolved) sys/amd64/amd64/elf_machdep.c (unresolved) sys/amd64/include/sgxreg.h (deleted) sys/amd64/linux/linux_sysvec.c (unresolved) sys/amd64/linux32/linux32_sysvec.c (unresolved) sys/amd64/sgx/sgx.c (deleted) sys/amd64/sgx/sgx_linux.c (deleted) sys/amd64/sgx/sgxvar.h (deleted) sys/arm/arm/elf_machdep.c (unresolved) sys/arm64/linux/linux_sysvec.c (unresolved) sys/compat/ia32/ia32_sysvec.c (unresolved) sys/compat/linux/linux_misc.c (unresolved) sys/i386/linux/imgact_linux.c (unresolved) sys/i386/linux/linux_sysvec.c (unresolved) sys/kern/imgact_aout.c (deleted) sys/kern/kern_environment.c (unresolved) sys/kern/kern_module.c (unresolved) sys/kern/kern_priv.c (unresolved) sys/kern/kern_resource.c (unresolved) sys/kern/sys_process.c (unresolved) sys/modules/aout/Makefile (deleted) sys/modules/sgx/Makefile (deleted) sys/modules/sgx_linux/Makefile (deleted) sys/netinet/ip_reass.c (unresolved) sys/riscv/riscv/elf_machdep.c (unresolved) sys/vm/vm_map.c (unresolved) sys/vm/vm_mmap.c (unresolved) tools/build/options/WITHOUT_KERNEL_RETPOLINE (deleted) tools/build/options/WITHOUT_LIB32 (deleted) tools/build/options/WITHOUT_PIE (deleted) tools/build/options/WITH_INIT_ALL_PATTERN (deleted) tools/build/options/WITH_INIT_ALL_ZERO (deleted) tools/build/options/WITH_KERNEL_RETPOLINE (deleted) tools/build/options/WITH_PIE (deleted) usr.sbin/newsyslog/newsyslog.conf.d/amd.conf (unresolved) usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf (unresolved) usr.sbin/rpc.yppasswdd/Makefile (unresolved)		2023-08-17 08:42:42 -06:00
..
release-dvd.conf