Commit Graph

3507 Commits

Author SHA1 Message Date
Brian Behlendorf 7e43e16395 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 15:34:50 -08:00
Brian Behlendorf 35f607040f Wrap additional new efi code in HAVE_LIBEFI macros 2008-12-16 15:33:00 -08:00
Brian Behlendorf 6e002c41b8 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 15:22:48 -08:00
Brian Behlendorf a3ea268b72 Add 2 missing headers 2008-12-16 15:20:56 -08:00
Brian Behlendorf ca161b928b Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 15:17:54 -08:00
Brian Behlendorf 36722eee12 Comment out most of the file until ZPL support arrives 2008-12-16 15:16:04 -08:00
Brian Behlendorf 6d01a82ce5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:45:32 -08:00
Brian Behlendorf ef919ac403 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:45:31 -08:00
Brian Behlendorf 66587f0fee Remove all the share stuff 2008-12-16 14:43:38 -08:00
Brian Behlendorf 66cf9db3d0 Remove non-existing systeminfo ref 2008-12-16 14:38:52 -08:00
Brian Behlendorf bc3c049cf3 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:25 -08:00
Brian Behlendorf 646230294f Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 14:35:24 -08:00
Brian Behlendorf 1f0ad04f2d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:21 -08:00
Brian Behlendorf dbd5e397c5 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 14:35:20 -08:00
Brian Behlendorf 6df0ae3703 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:17 -08:00
Brian Behlendorf e658a0f952 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-16 14:35:16 -08:00
Brian Behlendorf bbcc9f116f Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:13 -08:00
Brian Behlendorf 56692ac3aa Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 14:35:12 -08:00
Brian Behlendorf 5385f3b6e8 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:09 -08:00
Brian Behlendorf 653f9a6961 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-16 14:35:08 -08:00
Brian Behlendorf c201c67bfd Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:04 -08:00
Brian Behlendorf c75e9b1c12 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 14:35:03 -08:00
Brian Behlendorf 6fb9a6fe10 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:00 -08:00
Brian Behlendorf 8fd2c1c2f5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-16 14:34:59 -08:00
Brian Behlendorf 554ad1f247 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:56 -08:00
Brian Behlendorf 90a92de620 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-16 14:34:55 -08:00
Brian Behlendorf 1a42b0eef5 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:52 -08:00
Brian Behlendorf e213f59844 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 14:34:51 -08:00
Brian Behlendorf ff379b5e27 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:48 -08:00
Brian Behlendorf b17ad01f98 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 14:34:47 -08:00
Brian Behlendorf 4a162c766b Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:44 -08:00
Brian Behlendorf 5840198e26 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 14:34:43 -08:00
Brian Behlendorf 8439d752d3 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:39 -08:00
Brian Behlendorf 08cc9efc28 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-16 14:34:38 -08:00
Brian Behlendorf 27028d0a77 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-16 14:34:38 -08:00
Brian Behlendorf 6c377ad4c2 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:33 -08:00
Brian Behlendorf 754b3cb0e8 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-16 14:34:32 -08:00
Brian Behlendorf a4c93e56cc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 14:34:31 -08:00
Brian Behlendorf a3814f175d Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:26 -08:00
Brian Behlendorf 3686ad7c68 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-16 14:34:25 -08:00
Brian Behlendorf 289f71f642 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:22 -08:00
Brian Behlendorf 125e9815df Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 14:34:21 -08:00
Brian Behlendorf 51a30ee7d0 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:18 -08:00
Brian Behlendorf bb20fd94fc Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 14:34:17 -08:00
Brian Behlendorf b6a59061ae Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:14 -08:00
Brian Behlendorf 6f794f49bd Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-16 14:34:13 -08:00
Brian Behlendorf b292703aaa Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:10 -08:00
Brian Behlendorf 0c4636f3f2 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-16 14:34:08 -08:00
Brian Behlendorf a34d2ee906 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:05 -08:00
Brian Behlendorf f6faaef095 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 14:34:04 -08:00