Commit Graph

8442 Commits

Author SHA1 Message Date
Brian Behlendorf 456bfebb79 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-08 10:28:05 -08:00
Brian Behlendorf 8db756a802 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-08 10:28:02 -08:00
Brian Behlendorf c281c15c84 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-08 10:28:00 -08:00
Brian Behlendorf d8c60bd455 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-08 10:27:57 -08:00
Brian Behlendorf 008408a40f Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-08 10:27:55 -08:00
Brian Behlendorf 72f92dafd1 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-08 10:27:52 -08:00
Brian Behlendorf 318547fbae Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-08 10:27:50 -08:00
Brian Behlendorf 900f51818d Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-08 10:27:47 -08:00
Brian Behlendorf 195341c0de Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-08 10:27:45 -08:00
Brian Behlendorf b7d9adb500 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-08 10:27:42 -08:00
Brian Behlendorf 23e0e2e59b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-08 10:27:32 -08:00
Brian Behlendorf b38c50ac45 Update vdev_disk.c implementation to be compatible with b103 API 2009-01-08 10:25:23 -08:00
Brian Behlendorf b457fb49f9 Remove vdev_disk from userspace build, vdev_file is used 2009-01-08 10:23:59 -08:00
Brian Behlendorf 3af97a3552 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-07 15:53:45 -08:00
Brian Behlendorf 01fbc39003 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-07 15:53:43 -08:00
Brian Behlendorf d1398aa4a5 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-07 15:53:41 -08:00
Brian Behlendorf f1cf255273 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-07 15:53:39 -08:00
Brian Behlendorf 2b2970dead Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-07 15:53:36 -08:00
Brian Behlendorf d181addf0c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-07 15:53:34 -08:00
Brian Behlendorf c406f94a1e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-07 15:53:30 -08:00
Brian Behlendorf 4e38d21302 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-07 15:53:28 -08:00
Brian Behlendorf e58e11bde2 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-07 15:53:25 -08:00
Brian Behlendorf a362b45dc6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-07 15:53:23 -08:00
Brian Behlendorf 055f4b1d6d Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-07 15:53:19 -08:00
Brian Behlendorf 4dc2a0f02c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-07 15:53:17 -08:00
Brian Behlendorf d360300fb3 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-07 15:53:14 -08:00
Brian Behlendorf 44b0019398 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-07 15:53:12 -08:00
Brian Behlendorf 6256cfcc07 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-07 15:53:08 -08:00
Brian Behlendorf 4d2cdcd2f0 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-07 15:53:06 -08:00
Brian Behlendorf ad55ef1edb Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-07 15:53:03 -08:00
Brian Behlendorf 3cffd4f196 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-07 15:53:01 -08:00
Brian Behlendorf b06ebeb3a8 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:58 -08:00
Brian Behlendorf 4faa6ff9df Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-07 15:52:56 -08:00
Brian Behlendorf 3f7cdf7f5a Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:53 -08:00
Brian Behlendorf 47f55fd79b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-07 15:52:51 -08:00
Brian Behlendorf e15a46bf05 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:47 -08:00
Brian Behlendorf 1aab10f3c8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-07 15:52:46 -08:00
Brian Behlendorf b3216001b9 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:42 -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 cb4b11d791 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:33 -08:00
Brian Behlendorf cf6efb2639 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-07 15:52:32 -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 9442cd9d4d Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:24 -08:00
Brian Behlendorf a239450266 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-07 15:52:22 -08:00
Brian Behlendorf 57f2ccf84c Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:19 -08:00
Brian Behlendorf b3885ceca4 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-07 15:52:17 -08:00
Brian Behlendorf b12ce0c4a1 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:13 -08:00
Brian Behlendorf 7a83835cdb Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-07 15:52:11 -08:00
Brian Behlendorf 87a8eea84b Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-07 15:52:08 -08:00