Fix writeback regression introduced in -r2 that affected mmap() and AIO writes; Apply locking fixes from Illumos; Reintroduce uio_prefaultpages() to minimize the possibility of hitting zfsonlinux/zfs#1689; Add Linux 3.12 Support

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

6 files changed, 43 insertions, 279 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index ba815a465146..f89c92548dcb 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.39 2013/10/18 16:25:53 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.40 2013/11/21 15:47:44 ryao Exp $
+
+*zfs-kmod-0.6.2-r3 (21 Nov 2013)
+
+  21 Nov 2013; Richard Yao <ryao@gentoo.org> +zfs-kmod-0.6.2-r3.ebuild,
+  -zfs-kmod-0.6.2-r1.ebuild, -zfs-kmod-0.6.2-r2.ebuild, -zfs-kmod-0.6.2.ebuild,
+  zfs-kmod-9999.ebuild:
+  Fix writeback regression introduced in -r2 that affected mmap() and AIO
+  writes; Apply locking fixes from Illumos; Reintroduce uio_prefaultpages() to
+  minimize the possibility of hitting zfsonlinux/zfs#1689; Add Linux 3.12
+  Support
 
 *zfs-kmod-0.6.2-r2 (18 Oct 2013)
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index e4a8af49ec7a..928c83166645 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -42,34 +42,31 @@ DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d
 DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b
 DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
 DIST zfs-kmod-0.6.0-rc12-p0.tar.xz 13400 SHA256 700f88edb1a31d3df63f7a5be84429c6b835ec4a01820ec25b96881c9796db7a SHA512 846eb064daf40c4f53e3924ef6f0d05761fd85480e3471360c8be2089c4ebb9999b2b128e03c0b852a14d5dfa24e3a108b3d3bca1d96a39fef7beab2dde92f91 WHIRLPOOL 636b77725b0355097c92080b97a9871aacf5683b8e4af2d22ea03d5eac23f032f52319b68f43bc78286e2519f63f3d5ea9f5cf7fab84b688703ffa5479140680
-DIST zfs-kmod-0.6.2-p0.tar.xz 8244 SHA256 84456e1d52c6d44cc377d131ee34c042c289d00f74e7a9b521d8ef82bdfcf369 SHA512 ff29830e44aeb537d82d2c34070a245271b51013131f9191d03ab35eff2b86559c4bdadd3cf21f7aa7bec07c3556ef712db9cca2beedd1288036c29d750567e2 WHIRLPOOL 62b9a920a832f5715a24c2a0cdc914a5e77700b0e8723df868b1bf8b8a7ecec6f7df14cb294dfb4f4f219cc8253615c594b609a117b57b576e1796b8042bfdc5
-DIST zfs-kmod-0.6.2-p1.tar.xz 15988 SHA256 0d5ee6d53f6ba694937a9c1f009a0c18519e56cfcd328e5a42a0486f967608e5 SHA512 77b4f167073fa1be2501889f6795972a370c90b58dca121c95c38d98b37fa092ad043e5ab447e677f2207da7119b9fd2c940990bec83118edf18daff2eccaa16 WHIRLPOOL 730347f5d6c7449f309f6b53cdbcbb77b94c35385cebdb5a953f851f01d26c87d615b8ef673a7346f8351e01237833e18ed2fc7cca78bb200e7537222b3e46e2
+DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
 EBUILD zfs-kmod-0.6.0_rc10-r2.ebuild 3227 SHA256 eccca9d6f3b0713b6230e53ee6d9ee354ff76dd1a32ad4cbece398e0c4a27ae5 SHA512 495bc576b5f045341cfe596969bd3e59d2889ce2bd77b363a73e6dcf4e4aa791776789d4275dca8b83319b41df0c2325b77c6f6c8ccd8279b864d4967e63a653 WHIRLPOOL dd21c2178fa41259913fda31fd465e3d06f70b949a953b56df03bd0219c6ec4c0bd1abcf7a2f8bf736dc680e8fbeb756233d3d61101af9a6e626f303a3fd50a3
 EBUILD zfs-kmod-0.6.0_rc11-r3.ebuild 3309 SHA256 bf6cf7d17e6c8c8dc6bfbcb3c06312d255cef59f2c8d9c20b705525e692c9e97 SHA512 4aa254a563b10efc8778de87eedf428bb8f1ac8a0c246e61fb3688c2f4eb5d7c403e491018abcf17c40351ab6e0c0c57b598da4f97243faa593a97ad9d7510f6 WHIRLPOOL c31e111fdbc5b5dcdc0b85c96df677e6beaca676308876d2dd3a34b99819c224f65d1872539fbb2b74dd3298a1c1052c2aa15a3f0ca19aa3ac72b57b83797f0b
 EBUILD zfs-kmod-0.6.0_rc12-r3.ebuild 2812 SHA256 911f74a822282d35ef1e1acb81800ca32353e19923659485c678bfd438e4f96f SHA512 69008f5b443315571ac2d2c6aef34a883e95af3d46f4d380c29dbde64e50bbef635d676998495cf5f3a846bc4a8fd823b7ee9274085c96cc90e7a6aa26873af2 WHIRLPOOL 73c8cc45b33c7b6f72c48008203e8d7687acf69e29758ad9dc790b1d59d71ce6812102ec0003ac9338cf2a5e5916e6fc149ac54b38b37876a86f87769344e458
 EBUILD zfs-kmod-0.6.0_rc13-r4.ebuild 3017 SHA256 2a4fad318cf06cec520bb6110d814d76f8e2438fa1323e9ac73727640c83866a SHA512 94699ac019ce884cc6fec74d1da320f6d5b8b38e87aafbba5c1bc0a644fb448edac3aed9c1eb25038bd298b227e30e5c611cf771b168de4453ca954b56143364 WHIRLPOOL bbc349f5d781caa61e0413364c33b7b8ac988d6c49d5401ea28210b6a7f9e4819cba28999c0cdb9d3133ec7102f5014e95d29de793b619c4fd2cfaebe5e85d7b
 EBUILD zfs-kmod-0.6.0_rc14-r5.ebuild 3644 SHA256 4a1d63565ce004fb347d91ad2f0bd460304710b71cf668f3a0bc4379009d1172 SHA512 898e808086d1507cf41e246e6e2bddbaabbd3a80e422525dcb0e0585f3a90dde9de1473b5f469fc8c28ce05758dc248f6c7026ee28fcc48f8ad84aea1fe42783 WHIRLPOOL defa28b05fa88772e71ec60ce3953348b10a14b97840a1d962053bda65be5e3aacb18b08013340514b448614c31d6c9bd489623a352f8fadf94f40aff7a2d04f
 EBUILD zfs-kmod-0.6.1-r2.ebuild 4247 SHA256 99332fddd683857632399b83bda56e2018daf8843030ebe0d6f27ea991f79a02 SHA512 139a01fe883e51f6ba3f51c7832f7fb4add5562ade6159bc3a7e8f4cc032957c5f468f73599e85e88ecbb994027a89ec8a2bfafcc753bae52c9bf266d7e5555d WHIRLPOOL c0dcbde452c7eb2db873155340ac533d9340fc549f95f89c29c75fb78f47c9be5b2a18b28f807b790069b251b27909b52564cdd25e8674e8114c75058de72306
-EBUILD zfs-kmod-0.6.2-r1.ebuild 3414 SHA256 56252a69ef7409ce751082a2e53edb0d25982bd0c2830f9c10bfb90c8eb9e699 SHA512 15b7f8d0c75119e33739987fc30d763f0d4aaa131d9e75c7b1645e0aa94a99b0edf19582a57314f25a55add7fb1248f243fb356a99155b155db2e9e30142d97c WHIRLPOOL 4fb066ef27ac6827a700f66f80e246f6689cf4c8a9c8f27705980c08200f34424c86ca76dc0787f6ef3072e5e5765f0a9143525e5782a68c83198e0e5767954c
-EBUILD zfs-kmod-0.6.2-r2.ebuild 3414 SHA256 86bac8f89ad69a45b09812af549045fb9ca41cda67fea92f6a86a4f0713a1093 SHA512 532d0ae99aafeef9e8a929ca26ba260a7f67ec8acb1002c758563fa890c83b6fbc069afb2567377acf0675b1013330f39a0258e164f682160e0924ca19f4415a WHIRLPOOL cad526fe39a6ddd69282bb8d1b2d495ca62e2b7f61ef912e35a128db0712828b9e0ff1d3c89ed1436d80aec240701968377550fd984b0d9cde89e20666c259db
-EBUILD zfs-kmod-0.6.2.ebuild 3321 SHA256 c6581384dcbcc06af2844072d36d31606af4c5ac2f8ce7b12bc0d8e25e414515 SHA512 0e7f887bf8d05b8b07d2eca682a9ea7d56697b17028e74914fee8affff45120630b931194aae09687ba5aa8a6e558c68b82fe791f02e4688ecca57ee12c681e4 WHIRLPOOL b0a211f81c675d49a308e242e8a434dcb171debb06970f6559bd888776f64ff70d99122cb7b365d4c8a555f8500d98687f093c1569186d8425e6f63ad58f3db1
-EBUILD zfs-kmod-9999.ebuild 3200 SHA256 e5be82262de8dc4187f248aa3b7e99dcc5bd36f3d027cd6e2d4ddd729f1e81b9 SHA512 ea84bf3929c553841d17bdc4cae520bb4381dfeb5200606a253010ce9b3b8c799fb51b87796aa99ba69c2f79b8604f29276df5ca514f7810cf85d4b9121fbb33 WHIRLPOOL d583b736ff37b16f3a315598a9518de3e03630b3bd6e9cbf2c72a53bf6282ea59630ed2c5a779d17aa013280d5c9b1e62158aba3c883132bf7c20f60895d71f4
-MISC ChangeLog 11712 SHA256 437806005c2ad9f1a0bd8c6a082d0e857d330b15a43645f1e6868a1048ccfdb0 SHA512 687fed319b84739c0638c53d82fddffee5d89207be8821475c82465d141e496e24505133ddd7ea0b1356cfa36aa3c67dec8a2fcfd0062efa53b6b5e314fd9f79 WHIRLPOOL bfb43ff6f380ada2f5ffd42ea3c918522585f424e3265f8cd51e2a0e577c06277ffd0c992e5f053839acec2b1373cc39dd35d30dd152887b6db43e75241c76f2
+EBUILD zfs-kmod-0.6.2-r3.ebuild 3414 SHA256 b9cb0c4821fd037711d3bab5007d736720702dbd9fab533524ce260ff288306c SHA512 9321a79e11d81d52a2115c2f3a8232b715e1283caf22a1beef06bac5c6d580c6957bdf4ed792a34b4446a78ccf0ffbbddaa2015bf914063c5871bf1b17d9e347 WHIRLPOOL 9d8fa1f73a395effb484b55bcff693a9e2bc5303a3f34a9c429c19a4bacdac78f6c654d0a957da3a755bf2b4e69f625bf2f12d6e5e46ad9f5cd46190ec284b34
+EBUILD zfs-kmod-9999.ebuild 3411 SHA256 1d53c0d609913431e404c1271fe88a32ace846b78aa05c46cf4285dc161fab60 SHA512 6bc6b033965f0bbf3c081eeff9da1e3e90fe915e623fa5d9b5e5c93e955c3466e82600db40b0b84736733c1b72a24d446c099e1e2aa7617c6bbf80e0a280f687 WHIRLPOOL 85346994731c2cc72d0c7fec36ea9adff1c2086fe6fbca0e5abaecf4a84a66b4157f14f02169213f528e66a623cf5c187237ab2591dea1f095f0a7c92cc1dce9
+MISC ChangeLog 12160 SHA256 9f9e5e25889390556996b156bcfa2b2812ebb9185c582de0238d7ade8b98b0a7 SHA512 ac0fd1da5536f262c0d363f0f6079a0c6ebdb7eb7dbbf3c0d0e5d3b815993c3094e88643381d3d017d837daca24379e727abd1703bb761a1b3dc61555948cc67 WHIRLPOOL aedef9b2194625186c03e92fb67cca5dead9b68819531edf29f9523edb8502c32e308b5157aca7398c1a5a89096ea337eec3e8adf3905d3f955703f3c41db5c8
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSYWDaAAoJECDuEZm+6ExkMDMQAICZZDfGW0+oCWEkcHBt3Rdt
-8dM482stwNcDJE3LNgXO7eI7ZMQAReOv6VBl7qSZf3hzyqV7y+i4kCnxLJzMHr67
-Pn+OYViIQ1b82D+aNb7thPlE4Hb/fJqCX91VLfB0CvYUhdxuLMx/FjcUjhk9IsF7
-w8Lqe+kwSrRqVApW8zEUa04zKNtuG5eDXKY3/3FEephmBhVPIdGuFNi6FictJxOv
-W0VV6w6+pZLaoJcVf2NhDNaK0WKKGLeHqIL3cDQ5HESzqWrK10rqaVBKJNzyZjEB
-XNcM9UmKY0CK/wHToAh+5oaHWlXxA7gQpQxXviQTzSUpW2sdW7Fendp64gb13dLd
-V4ZH7cpVWfUE0DBAgJlhrzOfewu7YJmbNB2Kv+6pG4Gg1BqWFsqRMT3e4laZyTbq
-9lyeOGAqQlxfmsNEQLwxEWwGKrPnlyg3EG91WBpSnQNBQpdsysJECSX1zaTjZrow
-qjHaffp25PFYemf28vMyilIxIDA2zSr1m5gbsnaAmmvBGTZHwhoJvjLFUa1Tl8Z1
-r/3gnh8tg21A+xcAdmfz3Hk6T/Y2cw+949BNgjRJylUOsWncrjC9xUhKl1NoZTh+
-I4YknpUiUF7EHXzaWiov8IhJTt9bQeeytDutvqS7tASH0QQHboAAb1XtReEzWddA
-5lT1HhJmPSe61M6SGdbK
-=ktJI
+iQIcBAEBCAAGBQJSjis2AAoJECDuEZm+6ExkRHEP/jwN2K2m842oCpGLrhbasXbI
+AuVMYGmcpRBhnB+Ntj3/k1v8qYAXVuTXEY0o/NA9jCjq6N+INGz5a0c/6kWKctFh
+lgqIzAmZ7qMb1IZqTPUBZZ2hxthTS8nnF92wDjb/JhGTMsxajNy6+MQYOpAeUa7z
+ELecvk5YhsHazcLu84cXUU/qjJqNDz1gp13d5k6bLOIZuvoC/3PpnKvCVGQS+kE4
+8z9sK1kFc+zsZWFcqoCtXjllsAf54R5HRcfymCyO1F2P1w0dpd1nDkYIM+aGOwuN
+IWn7dmKGKDWlK+H6QgwZ+JIhop1wF8aMmXBStWSlH0lKGEG5AyN2Ve7FFJJfwtTI
+xYWHTdrDyavD/fO/XKv/GfTLrgYFQbOTzLd/FY7t6maWjanXE3amlYX937zJeTAU
+TVF34MxRGvTfk/PCGt8rqk2qdNISjRJa4nxzIKEQfIOCu685W29XEZH2LJUPXlrk
+VS2+XrbT2QyZUqc1iGp4S/TVqYSphc8cozsf1N5HO1nyMc2gc8V2qIWQsZYPQgv9
+YVL+6eJLjrXiDGjFl2PJQM7Q9WlCx1xrkhSlax+UF3EvU0uR3HWtuUECjaIf29NA
+0O8GXPFusZrR4TbvLwro2HbPReyfxpGZiXYZ5F9J/KCphG9UWAAUzVnBZ3G1UEEU
+NIK1H18DPMkyI+0e2nOs
+=Zbkf
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r2.ebuild
deleted file mode 100644
index 9ec379f4c077..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r2.ebuild,v 1.1 2013/10/18 16:25:53 ryao Exp $
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-2
-	MY_PV=9999
-	EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz
-		http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p1.tar.xz"
-	S="${WORKDIR}/zfs-zfs-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	dev-lang/perl
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		BLK_DEV_LOOP
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD
-			DEVTMPFS"
-
-	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 11 || die "Linux 3.11 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
-	fi
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm
-	then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for features flags."
-	ewarn "If you upgrade your pools to make use of feature flags, you will lose"
-	ewarn "the ability to import them using older versions of ZFSOnLinux."
-	ewarn "Any new pools will be created with feature flag support and will"
-	ewarn "not be compatible with older versions of ZFSOnLinux. To create a new"
-	ewarn "pool that is backward compatible, use zpool create -o version=28 ..."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild
index 0a474922e8fe..9e33094ba92f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r1.ebuild,v 1.3 2013/10/14 14:36:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild,v 1.1 2013/11/21 15:47:44 ryao Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
 	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz
-		http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p0.tar.xz"
+		http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz"
 	S="${WORKDIR}/zfs-zfs-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
@@ -60,7 +60,7 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 11 || die "Linux 3.11 is the latest supported version."; }
+		{ kernel_is le 3 12 || die "Linux 3.12 is the latest supported version."; }
 
 	check_extra_config
 }
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.2.ebuild
deleted file mode 100644
index 51e15addffce..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.2.ebuild,v 1.1 2013/08/23 23:20:07 ryao Exp $
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-2
-	MY_PV=9999
-	EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"
-	S="${WORKDIR}/zfs-zfs-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	dev-lang/perl
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		BLK_DEV_LOOP
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD
-			DEVTMPFS"
-
-	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 11 || die "Linux 3.11 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
-
-	# Provide /usr/src/zfs symlink for lustre
-	dosym "$(basename $(echo "${ED}/usr/src/zfs-"*))/${KV_FULL}" /usr/src/zfs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm
-	then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for features flags."
-	ewarn "If you upgrade your pools to make use of feature flags, you will lose"
-	ewarn "the ability to import them using older versions of ZFSOnLinux."
-	ewarn "Any new pools will be created with feature flag support and will"
-	ewarn "not be compatible with older versions of ZFSOnLinux. To create a new"
-	ewarn "pool that is backward compatible, use zpool create -o version=28 ..."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index b5c315003ce3..080ecbc62a74 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-2013 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.17 2013/04/17 14:30:18 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.18 2013/11/21 15:47:44 ryao Exp $
 
 EAPI="4"
 
@@ -17,7 +17,8 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"
+	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz
+		http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz"
 	S="${WORKDIR}/zfs-zfs-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
@@ -59,7 +60,7 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; }
+		{ kernel_is le 3 12 || die "Linux 3.12 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -68,6 +69,14 @@ src_prepare() {
 	# Remove GPLv2-licensed ZPIOS unless we are debugging
 	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
 
+	if [ ${PV} != "9999" ]
+	then
+		# Apply patch set
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
+	fi
+
 	autotools-utils_src_prepare
 }