Commit Graph

5039 Commits

Author SHA1 Message Date
Brian Behlendorf ca9f99f393 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-18 10:02:33 -08:00
Brian Behlendorf 8fa18afc2e Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 10:02:32 -08:00
Brian Behlendorf 0a4c40d7ab Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-18 10:02:29 -08:00
Brian Behlendorf 34c2e6d4d5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 10:02:27 -08:00
Brian Behlendorf 9033a612ae Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 10:02:26 -08:00
Brian Behlendorf 668d8be1b2 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-18 10:02:21 -08:00
Brian Behlendorf d693b6211e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-18 10:02:20 -08:00
Brian Behlendorf c5472b82d0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 10:02:19 -08:00
Brian Behlendorf b3c71d20a2 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-18 10:02:13 -08:00
Brian Behlendorf 800666569e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 10:02:11 -08:00
Brian Behlendorf e2caa48258 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-18 10:02:08 -08:00
Brian Behlendorf bec4224c89 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-18 10:02:07 -08:00
Brian Behlendorf 0d05a73fc6 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-18 10:02:03 -08:00
Brian Behlendorf ed5b55e3b2 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-18 10:02:02 -08:00
Brian Behlendorf 4fd3cafffe Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:59 -08:00
Brian Behlendorf 6c90fb3425 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-18 10:01:57 -08:00
Brian Behlendorf 7c548e3f8d Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:54 -08:00
Brian Behlendorf 6d33cacf86 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-18 10:01:52 -08:00
Brian Behlendorf 7fd57517bc Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:49 -08:00
Brian Behlendorf ea04fe3380 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-18 10:01:48 -08:00
Brian Behlendorf 4d86e8fa92 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:44 -08:00
Brian Behlendorf 4ac43732f6 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-18 10:01:42 -08:00
Brian Behlendorf 0a353443cd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 10:01:41 -08:00
Brian Behlendorf 9c0846462b Resolve conflict 2008-12-18 10:01:37 -08:00
Brian Behlendorf c501496c0e Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-18 10:00:47 -08:00
Brian Behlendorf 4df7b421a1 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-18 10:00:46 -08:00
Brian Behlendorf 25a3fca866 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 10:00:45 -08:00
Brian Behlendorf fef6bef576 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-18 10:00:44 -08:00
Brian Behlendorf 9e195d0cbf Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-18 10:00:44 -08:00
Brian Behlendorf c8f253cda8 Now fixed in fix-pthreads branch 2008-12-18 09:58:42 -08:00
Brian Behlendorf 229aba2943 Properly cast thread functions for pthreads 2008-12-18 09:56:22 -08:00
Brian Behlendorf 893ed2fad0 Properly cast thread functions for pthreads 2008-12-18 09:56:05 -08:00
Brian Behlendorf d511dad31e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 09:40:07 -08:00
Brian Behlendorf 5915f86ab1 Add callb.h header 2008-12-18 09:38:10 -08:00
Brian Behlendorf fe5b927a4a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:36:22 -08:00
Brian Behlendorf 0a6ac25d10 Add vmem_ interface mapping for user space 2008-12-18 09:34:27 -08:00
Brian Behlendorf 67a0c22eba Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-18 09:07:01 -08:00
Brian Behlendorf a719eb3870 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-18 09:06:59 -08:00
Brian Behlendorf e9e6ad9f78 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:56 -08:00
Brian Behlendorf 233a54ef04 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 09:06:54 -08:00
Brian Behlendorf e23b326c79 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:51 -08:00
Brian Behlendorf 9c416cd47f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-18 09:06:49 -08:00
Brian Behlendorf edd6781d0c Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:46 -08:00
Brian Behlendorf 27a9d2f1b9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-18 09:06:45 -08:00
Brian Behlendorf 70048b3471 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:41 -08:00
Brian Behlendorf d7f107e21a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-18 09:06:39 -08:00
Brian Behlendorf aac5e2181f Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:36 -08:00
Brian Behlendorf a34856dc66 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 09:06:35 -08:00
Brian Behlendorf 8922503146 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:06:32 -08:00
Brian Behlendorf 9cafa3bbd0 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 09:06:30 -08:00