summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING4
-rw-r--r--sys/sys/param.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 51365e3fdaae4..c997dab2c7b5b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
****************************** SPECIAL WARNING: ******************************
+20171005:
+ The arm port has split armv6 into armv6 and armv7. armv7 is now
+ a valid TARGET_ARCH/MACHINE_ARCH setting.
+
20171003:
When building multiple kernels using KERNCONF, non-existent KERNCONF
files will produce an error and buildkernel will fail. Previously
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 913662b615c8b..b453caa8b131b 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1200049 /* Master, propagated to newvers */
+#define __FreeBSD_version 1200050 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,