Author: sbruno
Date: Mon Dec 15 16:14:49 2014
New Revision: 275807
URL: https://svnweb.freebsd.org/changeset/base/275807
Log:
MFC r271982 and r271990 to support CentOS 6 ports.
Modified:
stable/10/UPDATING
stable/10/sys/compat/linux/linux_mib.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING Mon Dec 15 14:58:10 2014 (r275806)
+++ stable/10/UPDATING Mon Dec 15 16:14:49 2014 (r275807)
@@ -16,6 +16,16 @@ from older versions of FreeBSD, try WITH
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20141215:
+ 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.
+
+ See ports/UPDATING 20141202 on migration to CentOS 6 ports.
+
20141205:
pjdfstest has been integrated into kyua as an opt-in test suite.
Please see share/doc/pjdfstest/README for a more details on how to
Modified: stable/10/sys/compat/linux/linux_mib.c
==============================================================================
--- stable/10/sys/compat/linux/linux_mib.c Mon Dec 15 14:58:10 2014
(r275806)
+++ stable/10/sys/compat/linux/linux_mib.c Mon Dec 15 16:14:49 2014
(r275807)
@@ -130,9 +130,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;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
