Commit Graph

1947 Commits

Author SHA1 Message Date
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 f2d8d8666a Merge commit 'refs/top-bases/gcc-branch' into gcc-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 2ce1f366f3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 13:46:43 -08:00
Brian Behlendorf 310ae7fd2a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 13:46:42 -08:00
Brian Behlendorf 3bc01c0326 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 13:46:35 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 622cf66365 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-05 13:16:05 -08:00
Brian Behlendorf e7a7c9d048 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-05 13:16:04 -08:00
Brian Behlendorf b6423c7d27 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 13:15:58 -08:00
Brian Behlendorf 861ec17294 Update libunicode 2009-01-05 13:13:50 -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 1a26b866ef Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-01-05 12:09:04 -08:00
Brian Behlendorf 596fa26882 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-01-05 12:09:03 -08:00
Brian Behlendorf 7641911aec Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-01-05 12:09:01 -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 5da5d30ced Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-05 12:08:57 -08:00