Commit Graph

742 Commits

Author SHA1 Message Date
Brian Behlendorf 4a5bd7a3a8 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:02:11 -08:00
Brian Behlendorf 6c96fc31e9 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:02:10 -08:00
Brian Behlendorf bec036636e List cleanup and use of list_node_init initializer 2009-01-13 15:00:12 -08:00
Brian Behlendorf b935807a03 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-13 14:18:58 -08:00
Brian Behlendorf 95b289e62b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 14:18:58 -08:00
Brian Behlendorf b289f6dd98 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 14:18:50 -08:00
Brian Behlendorf bdb0ce1a0d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 14:18:11 -08:00
Brian Behlendorf 552c9e1abb Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 14:18:10 -08:00
Brian Behlendorf c6f1eca44b Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:18:09 -08:00
Brian Behlendorf 2ea04834bf Remove assertion for now 2009-01-13 14:16:11 -08:00
Brian Behlendorf 4b655d95db Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-13 13:33:17 -08:00
Brian Behlendorf a5643b08c3 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 13:33:16 -08:00
Brian Behlendorf 935c8157f9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 13:33:09 -08:00
Brian Behlendorf f8b66dcc4f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 13:32:31 -08:00
Brian Behlendorf 8ad629750e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-13 13:32:30 -08:00
Brian Behlendorf bb9b10a830 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-13 13:32:29 -08:00
Brian Behlendorf b73b29ab8e Fix c90 issue with { } 2009-01-13 13:30:35 -08:00
Brian Behlendorf 1481a4a7df Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-13 12:32:19 -08:00
Brian Behlendorf d07009d2f7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 12:32:18 -08:00
Brian Behlendorf 5a36a4b40b Pull in needed hunk from old patch stack for a ZFS build without the ZPL support 2009-01-13 12:28:26 -08:00
Brian Behlendorf 0093e81879 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 16:54:05 -08:00
Brian Behlendorf ca328c5d30 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:54:04 -08:00
Brian Behlendorf 3977cefecc Update load/unload message, mknod /dev/zfs when udev is unavailable 2009-01-09 16:50:28 -08:00
Brian Behlendorf 3122996061 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 16:42:02 -08:00
Brian Behlendorf d6e2f4a455 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:42:01 -08:00
Brian Behlendorf 7001fd57fa Register sensible init/fini hooks 2009-01-09 16:38:13 -08:00
Brian Behlendorf 91f6492ef5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 16:32:26 -08:00
Brian Behlendorf 4530d592f8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:32:24 -08:00
Brian Behlendorf d9a45283ce Add ZFS load/unload console messages 2009-01-09 16:28:26 -08:00
Brian Behlendorf c0f45a99fc Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 15:52:08 -08:00
Brian Behlendorf 3f70ee0f8a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 15:52:07 -08:00
Brian Behlendorf 1dc5e6d02e Remove HAVE_SPL should be HAVE_ZPL 2009-01-09 15:50:00 -08:00
Brian Behlendorf c766077d8c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 14:45:52 -08:00
Brian Behlendorf 3f48c3fcd5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 14:45:52 -08:00
Brian Behlendorf be3a17e437 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 14:45:45 -08:00
Brian Behlendorf ff09d64647 Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches 2009-01-09 14:37:45 -08:00
Brian Behlendorf 36eeb5eeb2 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 14:18:34 -08:00
Brian Behlendorf b55164f2cb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 14:18:33 -08:00
Brian Behlendorf 03a4aefbcf Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 14:18:25 -08:00
Brian Behlendorf 6b32aaea67 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 14:17:49 -08:00
Brian Behlendorf 86eb46d20b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 14:17:49 -08:00
Brian Behlendorf 578c9645df Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-09 14:17:48 -08:00
Brian Behlendorf 902ce659b0 Fix c90 compliance issue 2009-01-09 14:15:56 -08:00
Brian Behlendorf 6a2d852b35 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 13:33:56 -08:00
Brian Behlendorf c7b309f9b1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 13:33:55 -08:00
Brian Behlendorf bc5e2d8660 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 13:33:48 -08:00
Brian Behlendorf 7a7a074d3d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 13:33:11 -08:00
Brian Behlendorf cd5e331e68 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 13:33:10 -08:00
Brian Behlendorf 953d302b87 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-01-09 13:33:09 -08:00
Brian Behlendorf 04638ead67 Change zpool module name to zfs and update references 2009-01-09 13:31:16 -08:00
Brian Behlendorf ca4fc6ef63 Fix cast 2009-01-09 13:29:41 -08:00
Brian Behlendorf 68585e71a8 Get correct exit prototype 2009-01-09 13:28:42 -08:00
Brian Behlendorf 6e62e110c3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 12:48:35 -08:00
Brian Behlendorf 9199436355 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 12:48:34 -08:00
Brian Behlendorf 18f3ecb485 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 12:48:17 -08:00
Brian Behlendorf 129afe3ce8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 12:46:44 -08:00
Brian Behlendorf b4d27767d8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 12:46:42 -08:00
Brian Behlendorf b3064162aa Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-01-09 12:46:40 -08:00
Brian Behlendorf cb5fc9440b Remove extra defaults 2009-01-09 12:42:27 -08:00
Brian Behlendorf a18eb3cc93 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 11:44:43 -08:00
Brian Behlendorf 2735cd4ab1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 11:44:43 -08:00
Brian Behlendorf f0f1f7362d Remove invalid tunable 2009-01-09 11:42:31 -08:00
Brian Behlendorf a4df8635db Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 11:31:48 -08:00
Brian Behlendorf ab0e08c058 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 11:31:47 -08:00
Brian Behlendorf dd50143ea1 Add module load/unload entry point hooks and ioctl integration 2009-01-09 11:21:59 -08:00
Brian Behlendorf 62ce4aabc6 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 09:22:33 -08:00
Brian Behlendorf 47f49e3634 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 09:22:33 -08:00
Brian Behlendorf ed92da1e4e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 09:22:24 -08:00
Brian Behlendorf 91b9bf3f40 Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues 2009-01-09 09:19:33 -08:00
Brian Behlendorf 1b6dee2506 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-07 15:52:40 -08:00
Brian Behlendorf fdc9b1d377 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-07 15:52:39 -08:00
Brian Behlendorf 53a6418874 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-07 15:52:31 -08:00
Brian Behlendorf 2a76f03369 Update distfiles 2009-01-07 15:49:36 -08:00
Brian Behlendorf f30cedbaf3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 13:46:09 -08:00
Brian Behlendorf 1420cd5581 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 13:46:09 -08:00
Brian Behlendorf f01d7c3dba Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 13:46:02 -08:00
Brian Behlendorf 6280843d13 Remove until it can be updated 2009-01-06 13:43:53 -08:00
Brian Behlendorf 09a5a916ec Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 13:16:49 -08:00
Brian Behlendorf 0e16147946 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 13:16:49 -08:00
Brian Behlendorf 74bff69746 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 13:16:42 -08:00
Brian Behlendorf f9494f2bb1 Build missing sources 2009-01-06 13:14:30 -08:00
Brian Behlendorf b9b559258c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 13:01:38 -08:00
Brian Behlendorf 6842512863 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 13:01:37 -08:00
Brian Behlendorf 57aad95a52 Refresh exported symbols 2009-01-06 12:59:50 -08:00
Brian Behlendorf 461db1ecc9 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:40:31 -08:00
Brian Behlendorf 889a81fcf2 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:40:30 -08:00
Brian Behlendorf da647d38a3 Refresh exported symbols, remove zio_resume_threads as out of date 2009-01-06 09:38:39 -08:00
Brian Behlendorf ac63920b2c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:30:36 -08:00
Brian Behlendorf abca9d8b9a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:30:36 -08:00
Brian Behlendorf bc820e95a6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 09:30:29 -08:00
Brian Behlendorf 5f9b0590f5 Remove zfs_fuid for now from kernel source until needed by ZPL 2009-01-06 09:28:09 -08:00
Brian Behlendorf f6f3c46840 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:16:17 -08:00
Brian Behlendorf e4a4ad147a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:16:16 -08:00
Brian Behlendorf d71643eb94 Refresh exported symbols 2009-01-06 09:14:10 -08:00
Brian Behlendorf 43e4426b34 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-06 09:03:52 -08:00
Brian Behlendorf b521002205 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-06 09:03:51 -08:00
Brian Behlendorf 1c496f0235 Refresh exported spa_config symbols 2009-01-06 08:59:36 -08:00
Brian Behlendorf 3edbae3a2d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 16:59:20 -08:00
Brian Behlendorf 7feda9d67d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 16:59:18 -08:00
Brian Behlendorf 90ff526841 Remove symbol exports no longer needed with the dsl scrub rewrite 2009-01-05 16:55:15 -08:00
Brian Behlendorf 4f8a8bc8da Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 16:39:44 -08:00
Brian Behlendorf 7b1eb5d131 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 16:39:42 -08:00
Brian Behlendorf d763974558 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 16:39:26 -08:00
Brian Behlendorf 9d4d588938 Comment out until ZPL implemented 2009-01-05 16:34:01 -08:00
Brian Behlendorf 2800480736 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 16:00:42 -08:00
Brian Behlendorf 867b188b30 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 16:00:41 -08:00
Brian Behlendorf 76d40e2e81 Update exported symbols 2009-01-05 15:58:50 -08:00
Brian Behlendorf a9c201e00f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 15:45:13 -08:00
Brian Behlendorf ef0cd2992f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 15:45:12 -08:00
Brian Behlendorf b2db87f254 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 15:45:05 -08:00
Brian Behlendorf 760d78b9f8 Move default include paths after custom include paths so local stuff gets picked up first 2009-01-05 15:42:56 -08:00
Brian Behlendorf 4c741b2f9d Revert changes and resolve include issue by adjusting include path ordering 2009-01-05 15:40:56 -08:00
Brian Behlendorf bb4ca885b5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 15:21:19 -08:00
Brian Behlendorf 5b2b7fc3df Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 15:21:19 -08:00
Brian Behlendorf eb58273a29 Update exported symbol names for new traversal code 2009-01-05 15:19:35 -08:00
Brian Behlendorf 74245215c4 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 14:28:40 -08:00
Brian Behlendorf d1c8781815 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 14:28:39 -08:00
Brian Behlendorf ec462ce48f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 14:28:33 -08:00
Brian Behlendorf a4ecacdad7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 14:28:00 -08:00
Brian Behlendorf 93e72d1102 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-05 14:27:59 -08:00
Brian Behlendorf 854fda6d70 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-01-05 14:27:58 -08:00
Brian Behlendorf 12ee6d57c8 Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true 2009-01-05 14:26:16 -08:00
Brian Behlendorf a94bfe5a2d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 14:13:55 -08:00
Brian Behlendorf 743a2a757f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 14:13:54 -08:00
Brian Behlendorf d8f9597730 Always include u8_textprep 2009-01-05 14:12:03 -08:00
Brian Behlendorf 2dddcca89a Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 13:59:10 -08:00
Brian Behlendorf 4e41051097 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 13:59:09 -08:00
Brian Behlendorf 0c9de0c356 Linux kernel modularize unicode 2009-01-05 13:57:26 -08:00
Brian Behlendorf 1751caa615 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 12:40:38 -08:00
Brian Behlendorf 5d49f45c50 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 12:40:37 -08:00
Brian Behlendorf 9c2bf69ecb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:40:25 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf ced77c2f1b Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
Brian Behlendorf 61f28b82f0 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 12:11:00 -08:00
Brian Behlendorf dee2ae81f9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 12:10:58 -08:00
Brian Behlendorf 1c1ec8cce6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:10:37 -08:00
Brian Behlendorf 07c6176130 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 12:09:06 -08:00
Brian Behlendorf 52bc9eee2b Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-05 12:09:00 -08:00
Brian Behlendorf c239bd53d2 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-01-05 12:08:46 -08:00
Brian Behlendorf 65520ad8fd Merge commit 'refs/top-bases/fix-locks' into fix-locks 2009-01-05 12:08:36 -08:00
Brian Behlendorf 1bee6d83ae Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-01-05 12:08:23 -08:00
Brian Behlendorf 674ed5bd02 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-01-05 12:08:18 -08:00
Brian Behlendorf 91daa17079 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-01-05 12:08:16 -08:00
Brian Behlendorf 39b3a6a12d Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-05 12:08:11 -08:00
Brian Behlendorf 358ebaae5a Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-01-05 12:08:02 -08:00
Brian Behlendorf a22f3a712d Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-01-05 12:07:58 -08:00
Brian Behlendorf a55b0f2c1b Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-01-05 12:07:53 -08:00
Brian Behlendorf d09ef994e7 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-05 12:07:48 -08:00
Brian Behlendorf 5a7a00f67c Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-05 12:07:30 -08:00
Brian Behlendorf 7d4ccef58f Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-05 12:07:27 -08:00
Brian Behlendorf cdfd10ba79 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-05 12:07:25 -08:00
Brian Behlendorf 42bcb36c89 Add unicode library 2009-01-05 12:03:23 -08:00
Brian Behlendorf 0a963fa1b8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 13:49:54 -08:00
Brian Behlendorf 6b88c17a8f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:49:54 -08:00
Brian Behlendorf 39953e7eb3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:49:47 -08:00
Brian Behlendorf ffb8773241 Take out page map functions for now 2008-12-23 13:47:22 -08:00
Brian Behlendorf de6b729e33 Add Makefile tweak 2008-12-23 13:44:15 -08:00
Brian Behlendorf 4177b4715d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:13:37 -08:00
Brian Behlendorf 642a64b7bd Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 13:13:37 -08:00
Brian Behlendorf f49886c003 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:13:29 -08:00
Brian Behlendorf 7725fe7431 Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon 2008-12-23 13:11:03 -08:00
Brian Behlendorf e7e0111a7c Update makefile 2008-12-23 13:07:27 -08:00
Brian Behlendorf b4c584906e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 12:51:07 -08:00
Brian Behlendorf 9b3e361b6e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 12:51:06 -08:00
Brian Behlendorf c22ff325ce Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 12:50:58 -08:00
Brian Behlendorf 0dfd5ebee8 module/zcommon/Makefile.in 2008-12-23 12:47:03 -08:00
Brian Behlendorf 1431c8e452 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 11:50:06 -08:00
Brian Behlendorf 8209bef3af Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 11:50:05 -08:00
Brian Behlendorf 82cd3659a2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 11:49:58 -08:00
Brian Behlendorf 5a0a9cc451 Update makefiles 2008-12-23 11:47:33 -08:00
Brian Behlendorf 8f69262e09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:52:06 -08:00
Brian Behlendorf c93aec7f64 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:52:05 -08:00
Brian Behlendorf 1f72057409 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 13:51:57 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf 3b93dc4d82 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:14 -08:00
Brian Behlendorf 3a953fa870 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-22 13:51:13 -08:00
Brian Behlendorf d684390d3a Just fix a bogus return type 2008-12-22 13:49:15 -08:00
Brian Behlendorf a9058c38b3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:35:07 -08:00
Brian Behlendorf 9bfe4e627a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:35:06 -08:00
Brian Behlendorf 46badfb03b Only allow this for the kernel 2008-12-22 13:33:06 -08:00
Brian Behlendorf b49ce65660 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:41:35 -08:00
Brian Behlendorf fa9a05e496 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:41:35 -08:00
Brian Behlendorf 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 72f9288f09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:08:24 -08:00
Brian Behlendorf d51e1b0eeb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:08:23 -08:00
Brian Behlendorf 09de417e20 Move #endif up to expose userspace bits 2008-12-22 11:01:35 -08:00
Brian Behlendorf ba2c349faf Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 10:36:56 -08:00
Brian Behlendorf e0141c82aa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 10:36:55 -08:00
Brian Behlendorf bdbd91fe46 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 10:36:48 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf 07bc9c667e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 16:34:28 -08:00
Brian Behlendorf f7b6b1c5c1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 16:34:27 -08:00
Brian Behlendorf cbc70456f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:34:10 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf f935667824 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 13:48:01 -08:00
Brian Behlendorf 5ae92c2a3c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 13:48:00 -08:00
Brian Behlendorf 5cd3d5fe3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:47:53 -08:00
Brian Behlendorf 1b2a1a31bb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 13:47:20 -08:00
Brian Behlendorf b5e4bf3731 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 13:47:19 -08:00
Brian Behlendorf 8161b781a1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 89bd2100e7 Resolve a few more c90 issues 2008-12-19 13:45:24 -08:00
Brian Behlendorf d6bcad3544 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 12:38:40 -08:00
Brian Behlendorf f53179120a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 12:38:39 -08:00
Brian Behlendorf 5f5a7707b5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:38:25 -08:00
Brian Behlendorf 97818e5e2b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 12:37:17 -08:00
Brian Behlendorf 459f1388ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 12:37:15 -08:00
Brian Behlendorf 87810a7c8b Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 12:37:13 -08:00
Brian Behlendorf 93a6c0b0b9 Fix c90 for() issue 2008-12-19 12:33:22 -08:00
Brian Behlendorf d5b0e2f5f8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 11:06:33 -08:00
Brian Behlendorf f9e908db67 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 11:06:32 -08:00
Brian Behlendorf e5a6ed971b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -08:00
Brian Behlendorf cc92d6497b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf d67cf69e08 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf 893a49fa9a Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 11:05:48 -08:00
Brian Behlendorf 9041f66bad Fix all instances of for (int i;;) {} that were easily found 2008-12-19 11:03:54 -08:00
Brian Behlendorf 38712a11db Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 10:50:50 -08:00
Brian Behlendorf 25585a1884 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:50:49 -08:00
Brian Behlendorf 4f5a560334 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:50:42 -08:00
Brian Behlendorf 1db27e736e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:50:09 -08:00
Brian Behlendorf ead0ea6da5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:50:09 -08:00
Brian Behlendorf d9b08ad01f Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 10:50:08 -08:00
Brian Behlendorf 66e0d59024 Whoops, add missing j 2008-12-19 10:48:11 -08:00
Brian Behlendorf 7532b57352 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 10:37:14 -08:00
Brian Behlendorf fd01bfe6b1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:37:13 -08:00
Brian Behlendorf 01f8dc1f20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:37:06 -08:00
Brian Behlendorf 76247cc21d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:36:34 -08:00
Brian Behlendorf 800463b2ef Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:36:33 -08:00
Brian Behlendorf 7e159c86a3 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 10:36:32 -08:00
Brian Behlendorf 294ebb7537 Fix C90 for(int i;;;) compliance issues 2008-12-19 10:34:41 -08:00
Brian Behlendorf 8985e2430d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 10:26:57 -08:00
Brian Behlendorf 4ee870c380 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:26:57 -08:00
Brian Behlendorf f1ba2464f9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:26:50 -08:00
Brian Behlendorf e3815b6d3f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:26:18 -08:00
Brian Behlendorf e312737766 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:26:18 -08:00
Brian Behlendorf b66929fe90 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-19 10:26:17 -08:00
Brian Behlendorf 5ee6377759 Fix missing void in prototype 2008-12-19 10:24:26 -08:00
Brian Behlendorf f4f6b1f529 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 13:53:09 -08:00
Brian Behlendorf ecb1da0ac8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 13:53:08 -08:00
Brian Behlendorf ef0739a21d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:52:59 -08:00
Brian Behlendorf 433b5c8023 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:52:17 -08:00
Brian Behlendorf 93bc33a39e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:52:16 -08:00
Brian Behlendorf 23e30eeec9 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:52:15 -08:00
Brian Behlendorf 6cccf01d35 Missed needed drc var 2008-12-18 13:50:12 -08:00
Brian Behlendorf c513e66884 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 13:44:06 -08:00
Brian Behlendorf 360d4841e7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 13:44:05 -08:00
Brian Behlendorf 07901e75cc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:43:58 -08:00
Brian Behlendorf bab7f42832 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:43:20 -08:00
Brian Behlendorf 5ce7826ab4 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:43:19 -08:00
Brian Behlendorf 732fe6a75f Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:43:19 -08:00
Brian Behlendorf 973a9d5a79 Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway 2008-12-18 13:41:21 -08:00
Brian Behlendorf a3cbac5278 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 13:27:23 -08:00
Brian Behlendorf a0ba5c46c1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 13:27:22 -08:00
Brian Behlendorf fea7eb9fe4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:27:14 -08:00
Brian Behlendorf 1a6091791d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:26:36 -08:00
Brian Behlendorf 8f52e45adf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:26:35 -08:00
Brian Behlendorf 8eccbd95b9 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:26:34 -08:00
Brian Behlendorf 163f096cb6 Resolve remove shadow, rename to rm 2008-12-18 13:24:37 -08:00
Brian Behlendorf f94274b339 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 11:52:12 -08:00
Brian Behlendorf ec6250d9eb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 11:52:11 -08:00
Brian Behlendorf 5c0f0ca54f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 11:52:03 -08:00
Brian Behlendorf 4be8cdca38 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 11:51:24 -08:00
Brian Behlendorf cf4b3895f1 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 11:51:23 -08:00
Brian Behlendorf 458a2444c2 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 11:51:22 -08:00
Brian Behlendorf d957a6c66f Resolve dnp shadow conflict 2008-12-18 11:49:22 -08:00
Brian Behlendorf 60b7c664e0 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 11:39:15 -08:00
Brian Behlendorf 8b46ed9359 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 11:39:14 -08:00
Brian Behlendorf bf57b913fb Revert commit_cb feature 2008-12-18 11:39:02 -08:00
Brian Behlendorf 58645698b4 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 11:34:26 -08:00
Brian Behlendorf 9ae2c70438 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-18 11:34:25 -08:00
Brian Behlendorf 625fac6664 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-18 11:34:24 -08:00
Brian Behlendorf 63bf9b60d5 Revert changes from this branch so the branch may be removed. We
will integrate the latest patch from Sun here once everything is
is basically working.  This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
Brian Behlendorf 1321f5a556 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 11:25:28 -08:00
Brian Behlendorf 62618f9e3f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 11:25:28 -08:00
Brian Behlendorf 139baeef7c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 11:25:20 -08:00
Brian Behlendorf 2ef6ae9654 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 11:24:42 -08:00
Brian Behlendorf d431498139 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 11:24:41 -08:00
Brian Behlendorf 22f122e505 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 11:24:40 -08:00
Brian Behlendorf 50b70a0c9a Resolve time conflict 2008-12-18 11:22:39 -08:00
Brian Behlendorf 88ad31655c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 10:06:47 -08:00
Brian Behlendorf 57d4abfe7a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 10:06:46 -08:00
Brian Behlendorf cf126a8e16 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 10:06:38 -08:00
Brian Behlendorf 5c7ee1347b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 10:06:01 -08:00
Brian Behlendorf 012ce813df Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-18 10:06:00 -08:00
Brian Behlendorf e4d1734eb1 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-18 10:05:59 -08:00
Brian Behlendorf 432399da0f Add dropping written variable declaration 2008-12-18 10:03:57 -08:00
Brian Behlendorf bce797040c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 09:06:06 -08:00
Brian Behlendorf 8a75774b10 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 09:06:05 -08:00
Brian Behlendorf 1e70a9b85c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 09:05:57 -08:00
Brian Behlendorf 6b7c775e09 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 09:05:11 -08:00
Brian Behlendorf 06c9438f79 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 09:05:10 -08:00
Brian Behlendorf cfc42cf0ab Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 09:05:09 -08:00
Brian Behlendorf 0392342e3d Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-18 09:05:08 -08:00
Brian Behlendorf c37308fc20 Resolve stat conflict with stat() 2008-12-18 09:03:02 -08:00
Brian Behlendorf d1684019b4 Move int out of for construct for c90 compliance 2008-12-18 09:01:48 -08:00
Brian Behlendorf 62d4525a1c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-17 17:02:53 -08:00
Brian Behlendorf b311e10c5c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-17 17:02:51 -08:00
Brian Behlendorf 511af80b44 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 17:02:34 -08:00
Brian Behlendorf 53e66eef5a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 17:01:14 -08:00
Brian Behlendorf 6e26929ddf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 17:01:12 -08:00
Brian Behlendorf 420137d529 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 17:01:09 -08:00
Brian Behlendorf 194244b80b Resolve read shadow conflict 2008-12-17 16:57:21 -08:00
Brian Behlendorf 78fb6dc35b Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-17 13:11:23 -08:00
Brian Behlendorf 9016cb7c5c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-17 13:11:22 -08:00
Brian Behlendorf c326f72cdc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 13:11:15 -08:00
Brian Behlendorf 07411c1f84 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 13:10:39 -08:00
Brian Behlendorf 6ab9c098f1 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 13:10:39 -08:00
Brian Behlendorf 9842c708fa Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 13:10:38 -08:00
Brian Behlendorf 1e3aeaaef1 Resolve shadow conflict 2008-12-17 13:08:39 -08:00
Brian Behlendorf 399053dbb0 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-17 13:04:42 -08:00
Brian Behlendorf d4310f718b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-17 13:04:41 -08:00
Brian Behlendorf 56005b13e1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 13:04:33 -08:00
Brian Behlendorf b5740d86cf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 13:03:57 -08:00
Brian Behlendorf b9fe30002e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 13:03:57 -08:00
Brian Behlendorf e41d37c49d Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 13:03:56 -08:00
Brian Behlendorf fafeacb53f Resolve shadow conflict 2008-12-17 13:01:56 -08:00
Brian Behlendorf 945cf1f5db Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-17 12:47:12 -08:00
Brian Behlendorf 65a8241291 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-17 12:47:11 -08:00
Brian Behlendorf 137b3bb57d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 12:46:57 -08:00
Brian Behlendorf 863ec76ff7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 12:45:53 -08:00
Brian Behlendorf 941e464645 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 12:45:52 -08:00
Brian Behlendorf a1b865abee Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 12:45:51 -08:00
Brian Behlendorf da718dd80a Resolve shadow conflict 2008-12-17 12:42:17 -08:00
Brian Behlendorf 7881d6e148 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-17 12:28:37 -08:00
Brian Behlendorf 632a5dc58b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-17 12:28:36 -08:00
Brian Behlendorf 42752f2339 Resolve conflict 2008-12-17 12:28:15 -08:00
Brian Behlendorf 5fa2d90840 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 12:23:59 -08:00
Brian Behlendorf 9ef6211ce7 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 12:23:57 -08:00
Brian Behlendorf e2a977c404 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 12:23:55 -08:00
Brian Behlendorf b23299c7db Fix two prototypes in the right place 2008-12-17 12:20:20 -08:00
Brian Behlendorf c0e4b0cc84 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-17 12:15:49 -08:00
Brian Behlendorf fe7d776569 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-17 12:15:47 -08:00
Brian Behlendorf 895bbc24db Refresh context 2008-12-17 12:15:21 -08:00
Brian Behlendorf 385d51ad69 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:50:42 -08:00
Brian Behlendorf 6a509b3bca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:50:41 -08:00
Brian Behlendorf 3719c4146d Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 11:50:40 -08:00
Brian Behlendorf 77811f8236 Fix prototype 2008-12-17 11:48:40 -08:00
Brian Behlendorf d4ba0b9b50 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-11 15:24:35 -08:00
Brian Behlendorf c4de553f18 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-11 15:24:32 -08:00
Brian Behlendorf 6cc6f50a02 Move to new home 2008-12-11 15:21:20 -08:00
Brian Behlendorf c35e513cc4 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-11 14:59:48 -08:00
Brian Behlendorf 347e860de3 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-11 14:59:47 -08:00
Brian Behlendorf 515c1981f2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:59:39 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf 67e283a94c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-11 14:26:19 -08:00
Brian Behlendorf 2fd4174589 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-11 14:26:18 -08:00
Brian Behlendorf 8f8a7e587a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:26:10 -08:00
Brian Behlendorf 503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf f86c85c6a1 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 14:25:30 -08:00
Brian Behlendorf 4bc4fbeb38 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 14:25:29 -08:00
Brian Behlendorf 208f59182a Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 14:25:28 -08:00
Brian Behlendorf 32a5a583a3 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 14:25:22 -08:00
Brian Behlendorf b53201c0ca Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-11 14:25:16 -08:00
Brian Behlendorf 78b70a4471 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-11 14:25:10 -08:00
Brian Behlendorf 1e849d9b3b Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 14:25:08 -08:00
Brian Behlendorf 3f688a4bd8 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-11 14:25:07 -08:00
Brian Behlendorf b8294b1311 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 14:25:05 -08:00
Brian Behlendorf 0595328655 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 14:25:03 -08:00
Brian Behlendorf 022db7f816 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 14:25:01 -08:00
Brian Behlendorf ec2b4ef2ed Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 14:24:59 -08:00
Brian Behlendorf 9af6637db5 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 14:24:57 -08:00
Brian Behlendorf c325ac879c Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 14:24:56 -08:00
Brian Behlendorf 3e2988aa8b Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 14:24:50 -08:00
Brian Behlendorf 82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf 9b3c631dbd Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 14:24:48 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf 76678238e3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-11 14:05:03 -08:00
Brian Behlendorf dfc7c1463a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-11 14:05:02 -08:00
Brian Behlendorf 94e1055395 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:04:54 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf 028c2e29e9 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-11 11:36:22 -08:00
Brian Behlendorf ef5070a38b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-11 11:36:17 -08:00
Brian Behlendorf 5bb8f9ec25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
Brian Behlendorf e1694cfaec Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 11:27:18 -08:00
Brian Behlendorf 8aad84f781 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 11:27:12 -08:00
Brian Behlendorf e152d6e601 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 11:27:10 -08:00
Brian Behlendorf 206ceddde8 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 11:26:49 -08:00
Brian Behlendorf f421307e1b Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-11 11:26:25 -08:00
Brian Behlendorf fc3c415441 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-11 11:26:02 -08:00
Brian Behlendorf 84e65c5c1e Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 11:25:50 -08:00
Brian Behlendorf d00b912ed9 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-11 11:25:48 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf 3f25e7cd69 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 11:25:34 -08:00
Brian Behlendorf d6ccbb14c5 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 11:25:28 -08:00
Brian Behlendorf ff282a978f Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 11:25:22 -08:00
Brian Behlendorf cdd670cb2f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 11:25:15 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -08:00
Brian Behlendorf b342e90e44 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 11:24:51 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24:42 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00