Commit Graph

4054 Commits

Author SHA1 Message Date
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf fb3d1c555a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf 9439fbdcd3 Add systeminfo 2008-12-16 14:32:03 -08:00
Brian Behlendorf 53c0cdbc42 Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname 2008-12-16 14:29:35 -08:00
Brian Behlendorf 2c2372389a Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:24:23 -08:00
Brian Behlendorf 7df95c2f31 Add missing header 2008-12-16 14:22:31 -08:00
Brian Behlendorf e583bf8b9e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:19:55 -08:00
Brian Behlendorf f6207ec73a Add missing headers 2008-12-16 14:17:29 -08:00
Brian Behlendorf 52a453edaa Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:12:48 -08:00
Brian Behlendorf 9df591c9d3 Add sys/mount.h header 2008-12-16 14:10:43 -08:00
Brian Behlendorf 554defd465 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:07:00 -08:00
Brian Behlendorf 12cb53ce52 Make SHARENFS condition with ZPL 2008-12-16 14:05:09 -08:00
Brian Behlendorf 53bb8a832c Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:47 -08:00
Brian Behlendorf a07043191d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 13:31:46 -08:00
Brian Behlendorf 9780b535d5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:43 -08:00
Brian Behlendorf ac3a2f3476 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 13:31:42 -08:00
Brian Behlendorf 9417788e1b Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:39 -08:00
Brian Behlendorf 312c5695d4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-16 13:31:38 -08:00
Brian Behlendorf 5a49bf9bfb Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:35 -08:00
Brian Behlendorf 9af5c86c0c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 13:31:33 -08:00
Brian Behlendorf 5c1daa0b29 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:30 -08:00
Brian Behlendorf ea0768d150 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-16 13:31:29 -08:00
Brian Behlendorf c9ff83951c Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:26 -08:00
Brian Behlendorf 7bd9ab13e9 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 13:31:25 -08:00
Brian Behlendorf cc668500cc Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:22 -08:00
Brian Behlendorf bf2b4c60e0 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-16 13:31:21 -08:00
Brian Behlendorf d35dd3d829 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:18 -08:00
Brian Behlendorf eb83b94108 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-16 13:31:17 -08:00
Brian Behlendorf 3889bc41bf Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:14 -08:00
Brian Behlendorf 33072dc1bc Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 13:31:13 -08:00
Brian Behlendorf 721c488bf8 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:09 -08:00
Brian Behlendorf 48b059e690 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 13:31:08 -08:00
Brian Behlendorf e30c7dc225 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:05 -08:00
Brian Behlendorf 2f68235cc8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 13:31:04 -08:00
Brian Behlendorf a1f3839859 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-16 13:31:01 -08:00
Brian Behlendorf 3bdf85c7b6 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-16 13:31:00 -08:00
Brian Behlendorf 92f64010db Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-16 13:31:00 -08:00
Brian Behlendorf 34ddddd418 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:55 -08:00
Brian Behlendorf c4a3495d90 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-16 13:30:54 -08:00
Brian Behlendorf 751ee4041e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 13:30:53 -08:00
Brian Behlendorf b94632ccc4 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:48 -08:00
Brian Behlendorf a87065c836 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-16 13:30:47 -08:00
Brian Behlendorf a3f4203c72 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:43 -08:00
Brian Behlendorf 7a7297d716 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 13:30:42 -08:00
Brian Behlendorf dd34d71050 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:39 -08:00
Brian Behlendorf 8342056a8a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 13:30:38 -08:00
Brian Behlendorf 8516b5bee2 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:35 -08:00
Brian Behlendorf e8009afdd5 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-16 13:30:34 -08:00
Brian Behlendorf 52822a7efd Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:31 -08:00