From 8d1319516f4091e042a29b1dd353871d12b08965 Mon Sep 17 00:00:00 2001 From: asomers Date: Tue, 30 Jul 2019 19:55:55 +0000 Subject: [PATCH] Bump __FreeBSD_version r350437 presents a merge conflict with r350115, which raised __FreeBSD_version due to the addition of fusefs's intr/nointr mount options. Sponsored by: The FreeBSD Foundation --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 0c31c5a478ef..567857956a8a 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300038 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300039 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,