Backport important fixes from upstream HEAD; also includes important zvol initialization fixes (by me) that were sent upstream

(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

1 files changed, 20 insertions, 14 deletions

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 6b2580018f8d..5dbff3cebb10 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -25,6 +25,11 @@ AUX zfs-kmod-0.6.0_rc14-zfs_arc_memory_throttle_disable.patch 1354 SHA256 0d3690
 AUX zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch 1438 SHA256 d1f1b3f47e0ada27e43ac04576eb61a96b5abe3bc6a7bd7869fe72e1e08bb4df SHA512 f133fed7acea871bec4e08b9e24b358111877f8c8a481746639913ab162a3a85216ceb848f9461aa57ebaa1d90a61b7e5105938511f6a98dfd6c281592c5ab09 WHIRLPOOL c49ea43a12a8c9e4dca30df0dbbeba6f4fd07cf7c0271aa9c45d9bf3c5e8eef93efe9da600ec1b1c9bc782d55382674db68f07afd3f7c1083e0e1b85816d9416
 AUX zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch 1979 SHA256 6f61761703c4c71d8c91fb6e49b927069301698d78fea35c2bcdc603bfdce59d SHA512 dd4bfdd218791c6eef6120d95049860ba304ac474872357f3a5ff5b3783421a39035c732cd508f990145ff371bb8fcca2757152d41d963bcd559fa8f69fdedbe WHIRLPOOL 9bbd6479c22c905615ba6b4188aa332a9ec2685536cd6f784da28c081fdde430df15cb902b2ec1f7f9cdbfdcb20aabbc49460f5de09656686193001338c05a7a
 AUX zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch 2593 SHA256 a51425a9d97dc7177be6bf05a14d1905d52be5b503ab27e570e1e7e254befcf8 SHA512 7579231f68a1d840a1d568b12bb5bc8bd78d15c379020618b061015cc4771655650157e993ee77731f9bdc6e7ee1a6dd3ead3f548724e72e398b0400a9eeb5e4 WHIRLPOOL 57787a873e5c0195060a3e146c34f465df3c8fcb8123263435fcc9180bebef19fbba911767f8e5131063c0e1199db34c40c062038bb1d9bed311a4d8ac2e85ce
+AUX zfs-kmod-0.6.1-fix-getdents.patch 971 SHA256 c55cc963c0a5e9d42b7462c18b3be25af0020284652f3a2c7e1901eaca2567f7 SHA512 e5c41547ee1ee0e6aa67555501d8a6e18bbbe294c1b2deb6ce7af5efb07857d07acf2590867e64cd46f4abb0732b1048ad9edd8b30ad787d302ad3f6ec6284b2 WHIRLPOOL 7912eb4833acde65b6a12537dd0d34941ccdd8b23de4c80757d36059a3654a18c843ca4125a4acba175e13b93a7c0af4353dffa1e55429d2b6af8ceee2e96674
+AUX zfs-kmod-0.6.1-fix-txg_quiesce-deadlock.patch 2368 SHA256 af06930be9d5b7a068edb7a6b2971ca64083f3d7f2e8a1030d4828aa4ea5095a SHA512 2c439a1373f30974154d990225e3207c01ac66261fda4457e05744cddff9dabf86deeff30e68834669487accf26ea502851dc11f370e84e0f14112adc7838bd6 WHIRLPOOL 7ad335596f02e07ad3a6c5ee721384c50336c544597b0272052ee7d58c597760bbd1f56f7edf1197ca939cfce53ffefb415704d9b8034a8f38797496c62fdc5b
+AUX zfs-kmod-0.6.1-fix-xattr-behavior-1.patch 1218 SHA256 785b3649ec53aef5598b75e36686ee392541492b40221d468abf442c5eb0959d SHA512 f98ae5bf59ff84af3fe91b8d1589d4eac2588542007a7185b91dc40abf0f54f0b001d3614bfad342510ff2228fb79bb0275991e7d9ecfabf42659c5839737cc2 WHIRLPOOL e9e8512fb9e96d71e586d110e4db69dd49f42dcc59b62851c66541a5faf339665d7f99beb40357ed912daff6f85b7a75e92414cc4a8a65e3b634f8b56543c225
+AUX zfs-kmod-0.6.1-fix-xattr-behavior-2.patch 1205 SHA256 91e6e0e90504b5f71bcd4daae567b7f8830d6df21eefe299b03b6e3263fd1764 SHA512 23ce8867de27d8402b33ae672d009fabad8faa8a994021c745582aecad28519eeff3902503abb8842b04a649f720532535191fe16a53014157dfd89f55d95615 WHIRLPOOL 2fbe1ee885d53102dbdb22203ec7372039972e3e94b047134367c60e81dad28a845930e2d6cbbe22e2171dbd6cf56f9d91bf219b3e0c5f87ebc623518affc175
+AUX zfs-kmod-0.6.1-fix-zvol-initialization.patch 3100 SHA256 c954f330a1d3ff4404c194e304fa701becd77742516776cd2205712b5d1d0048 SHA512 df83773f9124960ebe47a4639b9dcde5e6b3e88960dbbc9ee93fd17c05b81ae75710779792519f038b983f2dcb1fa717392f3f11f09ac6fe1a4c7f0e0d494c78 WHIRLPOOL 723787fad324763e9315244589f766f0fc6751edab45f92dfb81482afbc316670d92b4a89916bf18eb6cf021c5f69d8e5d628e7bd1b20c0cee8352e279bc0461
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
 DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de443103d73db315b4f328c296cd6a073 SHA512 4bd2fc3cd5eb89f64b7b92a16e416edb245b0a9b90b5e1aa3bd1560c7d568322de03fdb40ede2d8417b0b642bbf70a1e804d51e4537babbfa9c767271b701138 WHIRLPOOL c56034028fd7c21f516ceb268cc25eeedd129a2a7cb8c1615f43982a86bb4400e80ab74159c4fc5d24a79610e2c0935f54cbc33c447751f29cecec882bfef89e
 DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c1501f0159c80a1b1ff961b6f137d6 SHA512 55f0d9ea9f085d78a4929250949449ec4329a71c00ecd6fe76322716b64dc1152d93a23bb8b18e4ba7e1fbd6110b170366763f730c1e5006998aee3870e3635e WHIRLPOOL ea8fbe2edb2e0029affed261916d10ef350129c496b71064d34749b805d83c1531d886a55802839bb4226e298719f708f6816ee5411626b431b1d506bbf10232
@@ -37,24 +42,25 @@ EBUILD zfs-kmod-0.6.0_rc11-r3.ebuild 3309 SHA256 bf6cf7d17e6c8c8dc6bfbcb3c06312d
 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-r1.ebuild 3782 SHA256 12bc91d310592bb45e2aa17151ad34955ef7439523c412fb26a19cca964efa6b SHA512 fbffe6f1b230d1f435fabac6403d1ce131b612e07e9ef4d111249343cf8031605189f2324534853746e8725342faf32064091928b5ca13e3488dd3a61723863c WHIRLPOOL 36d29cae2486a7cbd4022e8c12da11a8b5bfd1949d47d3de06d3bbf7eca6fbfbb191897ae4805685a1830a193e768e23b51cf51516d70b038b98f384db32aac5
 EBUILD zfs-kmod-0.6.1.ebuild 3319 SHA256 f7517f5307ab1a263daf088cc0c605602518eefc4c4a8b59d9d96e48822d6f07 SHA512 0ae099a96bfb414cc1d3632e000785efa792ef7385b2c92362bec94bc0c78cdd68f8112bbfda1cef0168ffbc1d4da37e8ff73f46f561d8ca6e2bf65751738f83 WHIRLPOOL 438e9b2a988c5e8db9b9893d7f7b5b8d29ca6879fb80caf71fb74f02f0f369865e333642deab195278e94f1b8b37e995ca90da50ba67479488925b1778f191e1
 EBUILD zfs-kmod-9999.ebuild 3200 SHA256 e5be82262de8dc4187f248aa3b7e99dcc5bd36f3d027cd6e2d4ddd729f1e81b9 SHA512 ea84bf3929c553841d17bdc4cae520bb4381dfeb5200606a253010ce9b3b8c799fb51b87796aa99ba69c2f79b8604f29276df5ca514f7810cf85d4b9121fbb33 WHIRLPOOL d583b736ff37b16f3a315598a9518de3e03630b3bd6e9cbf2c72a53bf6282ea59630ed2c5a779d17aa013280d5c9b1e62158aba3c883132bf7c20f60895d71f4
-MISC ChangeLog 8797 SHA256 52c215a8be35fbf03ac5c1046d2dbb83daae0aa077895959190ae0485b0226a5 SHA512 beda5cb38849071d88dd010e22a68c7fe53b3570553513cff24d66e4d3b617837ef6c24f81bbd49ca10ee35fe94405e1b724b7562383d02ed10522b1a72bc0a5 WHIRLPOOL 91fbd8020e9aa8e47fc63ee632a18d31c172ea3ff29401aca24ad950ad19aa91bb50ecd69e9e41a2f02602a99beaa10979e2eb1d8d601503527faf92a712b80b
+MISC ChangeLog 9296 SHA256 6d5ab7280530dc058b1f7a24917a3d5fc11a06734b6ca0c65fb7d44a493ebf73 SHA512 ddcfb166cef4d6e5c62f95bef2c649f5e22211e0b50e7bd4fa3474443ec8886605b480daad6fc9b30543a0625fafaa835d09755e19089e9a909d4eb197213563 WHIRLPOOL 54d3d4a06add21228bf658907a04bbefb75a437b09aa35991a84ee05da225bc8b9dcb2cec3dc1dd9749a1ba34b2271899a9d8fa6e6a7e5f145cfa00897600340
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRbrHbAAoJECDuEZm+6ExkzDUQAKsUcHQlyrDoO1AdALEuFqmQ
-o/NAsbMK1giFmXBr7RCb/aZ4abFBgVLvUDDbfXSb1UUObfCaJmtB9rMqRjsjfEQO
-Xj2t4P6s6U5pfAPOaVQrsbThNP3ESOTVJ1wDneUvrPlksuxGy7R+EvrEj91PZnI7
-UNmh0P5x4k1ZKy3VQR7YYluOAst6PXMSXiv44pkOODPdqig6/olEY7hRNj2pcuye
-gUFpSbkIcqGclFCZZbNzYoQMcdQBT7qhqoqUHflKzLlomYxQlaSDiDUVOAfbxIS/
-2IFU7Iautd0xrCZnABnqkD1o9KYc3GLeyY879ae0Zz+GrpHAfJTbL7NkC27RUfj5
-bNkeuyWuHlBAVALKTm4jPCOQptKDKEC01jgwIjfAWf9TgIBTm/82fJpSoSWVXZmb
-rykcqo/cOXPUdp7d1Iz5Kn5xnO7WW/dMwvyWqCg8IDqTGI8GDyuZ28DDY+hHtJcH
-dXpTxgd5Y776Tvmcb8coFNjYTtYobzUV/2ExeOzzzqcUpI2WmvOz8tJtslXZ1LQD
-GJsuEHuZsmt7QXkRr1BHy6jdSLQ87qBerVIiPTzaqTMnw2q+7Oep9vgGTvrBga6a
-oOV2u1yttX4F2wzBdl7dVycE1sjKQAMTlmiYPmQiUKxnnrVVTPeABGoyjce+HKNe
-06t4k2w9yDviN/Llvbn3
-=E2PL
+iQIcBAEBCAAGBQJRpKxIAAoJECDuEZm+6Exk1ykQAIWvax1cbY6D4/M7eBKRuFlV
+0Xo6OC+4Ol9Yt9zef9Ai6i03PIgtn8qHu+YDroNJfg4wfnbLCvqbD9FnMLwLcUSE
+fGECm1fbUJOrMxePsdPggf6LOilzHvDWEVooEppFcDL20ccK5usUoUiyPsesxuAd
+9ngHbnQIcgNbaGa1QkRClM/zaqEnWMXFwynHu7pE0X9eU4UtCYOZKc7dU5rfDwC0
+Sv5UkNUVj/JkAEhpkAYakleg0JIt824gUFFxghRdy7r6dAaQ/jEshOHdPWPHXUo4
+b48jilp8ma1pn1Ajp+l64jY1mUi3IY2tPvowInWiblqSxaq7gYgZb+bPJJ5alKNe
+YO4588rkMgwZXg+KfqmmrPQkVMjHCuqRt6aaShRaebABAB1kMj51WwIhvQrrG5fl
+3MoJPim/IyIR9Yta0KD32MmNLZInCL/JuMuZCESBy4cmIcsq1bSvQeBiiuUavoNe
+FdJHDkh0sGRuYTHAf0wGk/BywadKn/DgKh84CYOFETiZg4XRKPfh5OjIcvFzl3UT
+kZWJXrw9wK6RxBbGeCew1iJaiaaw6CMJ2BcLtUSy70qSzYR7tDK0oXtHpUzvTmRt
+wwml89t82fT8I6wX6Fdq2GzeCuxLznCpRpp80iZf7U9caoYY69cKhBYTAWE3j6iB
+wfRK71i+CfXRVquPjfAp
+=980+
 -----END PGP SIGNATURE-----