Commit Graph

6161 Commits

Author SHA1 Message Date
Brian Behlendorf 343b5df16a Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:12 -08:00
Brian Behlendorf f4ff14afdb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 13:38:11 -08:00
Brian Behlendorf ec053bced3 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:08 -08:00
Brian Behlendorf 0127d5e65b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 13:38:07 -08:00
Brian Behlendorf 3f8a7ba08b Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:04 -08:00
Brian Behlendorf 4f60483c0f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 13:38:03 -08:00
Brian Behlendorf fc45f65ed8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 13:38:02 -08:00
Brian Behlendorf 2338849c28 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:57 -08:00
Brian Behlendorf f8b1b642ba Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 13:37:56 -08:00
Brian Behlendorf 4679c1631c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:37:55 -08:00
Brian Behlendorf 270dc7ff16 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:50 -08:00
Brian Behlendorf 5f5ec65f60 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 13:37:48 -08:00
Brian Behlendorf edcac42a3e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:45 -08:00
Brian Behlendorf 91e1f08ddf Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 13:37:44 -08:00
Brian Behlendorf 062a43c97d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:41 -08:00
Brian Behlendorf 102a98af37 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 13:37:40 -08:00
Brian Behlendorf a06b196074 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:36 -08:00
Brian Behlendorf 0bf5516c1e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 13:37:35 -08:00
Brian Behlendorf de655a6dbd Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:32 -08:00
Brian Behlendorf f9eabd0efa Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 13:37:31 -08:00
Brian Behlendorf 17dea5c409 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:28 -08:00
Brian Behlendorf fd620ed193 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 13:37:27 -08:00
Brian Behlendorf d1f5be0b8b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:23 -08:00
Brian Behlendorf 1434cf046e Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 13:37:22 -08:00
Brian Behlendorf 8ab575cd8e Remove vdev_disk.c from userspace build, we simply use vdev_file.c here 2008-12-19 13:35:29 -08:00
Brian Behlendorf add6c31eed Update vdev_disk for in-kernel use 2008-12-19 13:34:38 -08:00
Brian Behlendorf e8066bf2dc Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 13:16:49 -08:00
Brian Behlendorf b95f799218 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 13:16:48 -08:00
Brian Behlendorf 28edfc91c8 Add compress header 2008-12-19 13:14:49 -08:00
Brian Behlendorf 83656caeaa Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 12:40:11 -08:00
Brian Behlendorf ed16d32847 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 12:40:10 -08:00
Brian Behlendorf 2b800ba091 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 12:40:07 -08:00
Brian Behlendorf 338dd65c10 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:40:02 -08:00
Brian Behlendorf ee4b20891e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 12:40:01 -08:00
Brian Behlendorf fa45950c1b Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:54 -08:00
Brian Behlendorf b3fafb4b75 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 12:39:52 -08:00
Brian Behlendorf 375226c1d5 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:46 -08:00
Brian Behlendorf e0457c6f15 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 12:39:43 -08:00
Brian Behlendorf 0b776d9f84 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:37 -08:00
Brian Behlendorf 5444e131df Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 12:39:35 -08:00
Brian Behlendorf 27d6884354 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:30 -08:00
Brian Behlendorf 3fa69de0ba Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 12:39:28 -08:00
Brian Behlendorf f1d4b64ad0 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:23 -08:00
Brian Behlendorf 4daafd6f1e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 12:39:21 -08:00
Brian Behlendorf 978a02a7e5 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:14 -08:00
Brian Behlendorf 385cabaff9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 12:39:11 -08:00
Brian Behlendorf 16d123e8a9 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:39:04 -08:00
Brian Behlendorf ca5b279dc4 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 12:39:02 -08:00
Brian Behlendorf 41569454ef Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 12:38:57 -08:00
Brian Behlendorf 3406c35fda Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 12:38:55 -08:00