summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/zfs-kmod/ChangeLog6
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-9999.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index a2ef3bd338f4..508fc12c5f92 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/zfs-kmod
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.61 2015/07/14 03:17:14 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.62 2015/07/24 04:32:25 ryao Exp $
+
+ 24 Jul 2015; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.4.2.ebuild,
+ zfs-kmod-0.6.4.ebuild, zfs-kmod-9999.ebuild:
+ Sync 9999 ebuild kernel options with 0.6.4.2 ebuild
14 Jul 2015; Yixun Lan <dlan@gentoo.org> zfs-kmod-0.6.4.2.ebuild:
support kernel latest version 4.1, fixed
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 27ca881f393f..d1dc7629250c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.28 2015/05/15 18:27:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.29 2015/07/24 04:32:25 ryao Exp $
EAPI="4"
@@ -48,7 +48,7 @@ pkg_setup() {
IOSCHED_NOOP
MODULES
!PAX_KERNEXEC_PLUGIN_METHOD_OR
- !PAX_RANDKSTACK
+ !PAX_USERCOPY_SLABS
ZLIB_DEFLATE
ZLIB_INFLATE
"