Commit Graph

17132 Commits

Author SHA1 Message Date
Brian Behlendorf 89313d8594 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-11-20 10:39:44 -08:00
Brian Behlendorf a40a4803a8 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-11-20 10:39:42 -08:00
Brian Behlendorf 6936334ac1 Revert linux-have-uio-rw branch, moved to linux-kernel-disk branch. 2009-11-20 10:35:26 -08:00
Brian Behlendorf 8bacf4f03d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-11-20 10:32:06 -08:00
Brian Behlendorf 88be0ad843 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-11-20 10:32:04 -08:00
Brian Behlendorf 5449a7e137 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-11-20 10:32:03 -08:00
Brian Behlendorf d4016e7342 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-11-20 10:32:01 -08:00
Brian Behlendorf b09faf60a5 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-11-20 10:31:55 -08:00
Brian Behlendorf b1075d949d Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-11-20 10:31:53 -08:00
Brian Behlendorf e09350061e Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-11-20 10:31:47 -08:00
Brian Behlendorf f040fe14b4 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-11-20 10:31:45 -08:00
Brian Behlendorf 5c6177b4f7 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-11-20 10:31:39 -08:00
Brian Behlendorf 5a59a39b01 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-11-20 10:31:38 -08:00
Brian Behlendorf 15a23b7afa Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-11-20 10:31:31 -08:00
Brian Behlendorf 0fa82994c4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-11-20 10:31:30 -08:00
Brian Behlendorf 5f437ebc6a Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-11-20 10:31:24 -08:00
Brian Behlendorf bf333c5408 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-11-20 10:31:22 -08:00
Brian Behlendorf a84ca879f9 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-11-20 10:31:15 -08:00
Brian Behlendorf d1aade1c7b Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-11-20 10:31:13 -08:00
Brian Behlendorf 353e47e842 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-11-20 10:31:07 -08:00
Brian Behlendorf 36e9b54bf4 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-11-20 10:31:05 -08:00
Brian Behlendorf f84aab3df8 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-11-20 10:30:59 -08:00
Brian Behlendorf fa92669c86 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-11-20 10:30:58 -08:00
Brian Behlendorf 5a0de93fcd Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-11-20 10:30:52 -08:00
Brian Behlendorf 49fdb13bc8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-11-20 10:30:50 -08:00
Brian Behlendorf 4cc12df6b4 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-11-20 10:30:43 -08:00
Brian Behlendorf 29dd6c3161 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-11-20 10:30:42 -08:00
Brian Behlendorf 7da32c3c8e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-11-20 10:30:41 -08:00
Brian Behlendorf 4edabd1904 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-11-20 10:30:30 -08:00
Brian Behlendorf d40808c351 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-20 10:30:28 -08:00
Brian Behlendorf 07cdadc1f8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-20 10:30:27 -08:00
Brian Behlendorf a9d254d0be Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-11-20 10:30:17 -08:00
Brian Behlendorf 6e3ed3f781 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-11-20 10:30:15 -08:00
Brian Behlendorf 841e4d1530 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-11-20 10:30:09 -08:00
Brian Behlendorf c8c546ee05 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-11-20 10:30:06 -08:00
Brian Behlendorf 5b16fb313f Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-11-20 10:30:00 -08:00
Brian Behlendorf 2fb4c69f17 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-11-20 10:29:58 -08:00
Brian Behlendorf 6d8a17ed45 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-11-20 10:29:52 -08:00
Brian Behlendorf e007a57d4f Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-20 10:29:50 -08:00
Brian Behlendorf cac1bc41dc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-20 10:29:49 -08:00
Brian Behlendorf 77c347db31 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-11-20 10:29:48 -08:00
Brian Behlendorf 9c8765a219 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-11-20 10:29:48 -08:00
Brian Behlendorf 0f315a58bb Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-11-20 10:29:47 -08:00
Brian Behlendorf 0160d32326 Symbol spa_busy() not required in Linux port removing EXPORT_SYMBOL 2009-11-20 10:16:37 -08:00
Brian Behlendorf 23304dc828 Add 16 drive promise JBOD zpool configs for small test setup. 2009-11-20 10:12:41 -08:00
Brian Behlendorf 6fabeffd3b Additional ZVOL compatibility autoconf checks and zconfig ZVOL sanity test. 2009-11-20 10:04:56 -08:00
Brian Behlendorf 3191b962f6 Prevent gcc uninit compiler warning in zfs_range_unlock_reader(). 2009-11-20 09:59:58 -08:00
Brian Behlendorf 81c56431ae Refresh autogen products 2009-11-16 10:42:39 -08:00
Brian Behlendorf c8806102c5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-11-16 10:38:37 -08:00
Brian Behlendorf 83d82c2535 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-11-16 10:38:36 -08:00