The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d70e5b3a735ef294477889646f8a58afa0b45000
commit d70e5b3a735ef294477889646f8a58afa0b45000 Author: Mark Johnston <[email protected]> AuthorDate: 2026-08-25 18:08:38 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2026-08-25 18:08:38 +0000 conf: Add COMPAT_FREEBSD15 Define it everywhere that wants COMPAT_FREEBSD14. Reviewed by: imp, kib, emaste Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D59017 --- sys/amd64/conf/FIRECRACKER | 1 + sys/amd64/conf/GENERIC | 1 + sys/amd64/conf/MINIMAL | 1 + sys/arm/conf/std.armv7 | 1 + sys/arm64/conf/std.arm64 | 1 + sys/conf/NOTES | 3 +++ sys/conf/options | 1 + sys/i386/conf/GENERIC | 1 + sys/i386/conf/MINIMAL | 1 + sys/powerpc/conf/GENERIC | 1 + sys/powerpc/conf/GENERIC64 | 1 + sys/powerpc/conf/GENERIC64LE | 1 + sys/powerpc/conf/MPC85XX | 1 + sys/riscv/conf/GENERIC | 1 + 14 files changed, 16 insertions(+) diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER index 676199602ede..6744c7694778 100644 --- a/sys/amd64/conf/FIRECRACKER +++ b/sys/amd64/conf/FIRECRACKER @@ -61,6 +61,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 3d4c27430fe0..e53d42c0ac43 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -70,6 +70,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 30a8dad75b7b..806d0baef9e7 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -54,6 +54,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/arm/conf/std.armv7 b/sys/arm/conf/std.armv7 index 1f8e93fe53f3..e74925837b80 100644 --- a/sys/arm/conf/std.armv7 +++ b/sys/arm/conf/std.armv7 @@ -53,6 +53,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 # DTrace support options KDTRACE_HOOKS # Kernel DTrace hooks diff --git a/sys/arm64/conf/std.arm64 b/sys/arm64/conf/std.arm64 index 5f02a0291721..47d803a7c37e 100644 --- a/sys/arm64/conf/std.arm64 +++ b/sys/arm64/conf/std.arm64 @@ -45,6 +45,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 560b3554fe06..11af716a8e08 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -366,6 +366,9 @@ options COMPAT_FREEBSD13 # Enable FreeBSD14 compatibility syscalls options COMPAT_FREEBSD14 +# Enable FreeBSD14 compatibility syscalls +options COMPAT_FREEBSD15 + # Enable Linux Kernel Programming Interface options COMPAT_LINUXKPI diff --git a/sys/conf/options b/sys/conf/options index 6a5337693751..8a9bee6ff5d3 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -100,6 +100,7 @@ COMPAT_FREEBSD11 opt_global.h COMPAT_FREEBSD12 opt_global.h COMPAT_FREEBSD13 opt_global.h COMPAT_FREEBSD14 opt_global.h +COMPAT_FREEBSD15 opt_global.h COMPAT_LINUXKPI opt_dontuse.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 44926bc2d3d5..8a22d4996670 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -65,6 +65,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index e3ef9dddbea8..fd00c5d71e89 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -61,6 +61,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 155a8c4eeeb5..f1a3aeb40183 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -69,6 +69,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) syscall trace support options STACK # stack(9) support diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index b435ebcf87b7..41a8260391bd 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -77,6 +77,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) syscall trace support options STACK # stack(9) support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index c6dbbdc3a613..8c19003cc635 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -73,6 +73,7 @@ options COMPAT_FREEBSD11 # Compatible with FreeBSD11 (required by options COMPAT_FREEBSD12 # Compatible with FreeBSD12 (required by ports) options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) syscall trace support diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX index 6b02a2e8d545..fccbdbea8342 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -64,6 +64,7 @@ options COMPAT_FREEBSD11 options COMPAT_FREEBSD12 options COMPAT_FREEBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options HWPMC_HOOKS options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index b8b3aacfab83..662a999a87d7 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -57,6 +57,7 @@ options GEOM_LABEL # Provides labelization options COMPAT_FREEBSD12 # Compatible with FreeBSD12 options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options COMPAT_FREEBSD14 # Compatible with FreeBSD14 +options COMPAT_FREEBSD15 # Compatible with FreeBSD15 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support
