svn commit: r296219 - in stable/9: . sys/compat/linux sys/sys

[Rene Ladan]

Author: rene (doc,ports committer)
Date: Mon Feb 29 18:55:27 2016
New Revision: 296219
URL: https://svnweb.freebsd.org/changeset/base/296219

Log:
  MFC r271982:
  
  Bump the default version of the Linux emulation layer to 2.6.18 to support
  the CentOS 6 ports out of the box.
  
  MFC r271990:
  
  Add a note to UPDATING
  
  Approved by:		dchagin
  Differential Revision:	https://reviews.freebsd.org/D5418

Modified:
  stable/9/UPDATING   (contents, props changed)
  stable/9/sys/compat/linux/linux_mib.c
  stable/9/sys/sys/param.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/UPDATING
==============================================================================
--- stable/9/UPDATING	Mon Feb 29 18:35:16 2016	(r296218)
+++ stable/9/UPDATING	Mon Feb 29 18:55:27 2016	(r296219)
@@ -30,6 +30,14 @@ Items affecting the ports and packages s
 	sendmail default for client connections has been raised to
 	1024 bits.
 
+20140922:
+	At svn r271982, The default linux compat kernel ABI has been adjusted
+	to 2.6.18 in support of the linux-c6 compat ports infrastructure
+	update.  If you wish to continue using the linux-f10 compat ports,
+	add compat.linux.osrelease=2.6.16 to your local sysctl.conf.  Users are
+	encouraged to update their linux-compat packages to linux-c6 during
+	their next update cycle.
+
 20140717:
 	It is no longer necessary to include the dwarf version in your DEBUG
 	options in your kernel config file. The bug that required it to be

Modified: stable/9/sys/compat/linux/linux_mib.c
==============================================================================
--- stable/9/sys/compat/linux/linux_mib.c	Mon Feb 29 18:35:16 2016	(r296218)
+++ stable/9/sys/compat/linux/linux_mib.c	Mon Feb 29 18:55:27 2016	(r296219)
@@ -129,9 +129,9 @@ struct linux_prison {
 
 static struct linux_prison lprison0 = {
 	.pr_osname =		"Linux",
-	.pr_osrelease =		"2.6.16",
+	.pr_osrelease =		"2.6.18",
 	.pr_oss_version =	0x030600,
-	.pr_osrel =		2006016
+	.pr_osrel =		2006018
 };
 
 static unsigned linux_osd_jail_slot;

Modified: stable/9/sys/sys/param.h
==============================================================================
--- stable/9/sys/sys/param.h	Mon Feb 29 18:35:16 2016	(r296218)
+++ stable/9/sys/sys/param.h	Mon Feb 29 18:55:27 2016	(r296219)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 903508	/* Master, propagated to newvers */
+#define __FreeBSD_version 903509	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,