Commit Graph

6161 Commits

Author SHA1 Message Date
Brian Behlendorf 35f065db51 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 10:19:14 -08:00
Brian Behlendorf 1a238799ba Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 10:19:12 -08:00
Brian Behlendorf c00e103ca1 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 10:19:08 -08:00
Brian Behlendorf 42e7e0b017 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 10:19:07 -08:00
Brian Behlendorf 9b11e0f4dd Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 10:19:04 -08:00
Brian Behlendorf b99e44346b Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 10:19:02 -08:00
Brian Behlendorf 753b745668 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:19:01 -08:00
Brian Behlendorf c6f1719538 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:56 -08:00
Brian Behlendorf 113fbdc5a2 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 10:18:54 -08:00
Brian Behlendorf a577858f33 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:18:53 -08:00
Brian Behlendorf d0349bbd69 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:48 -08:00
Brian Behlendorf cff15d06fa Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 10:18:46 -08:00
Brian Behlendorf 86d0b76bc0 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:43 -08:00
Brian Behlendorf 265cb0345b Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 10:18:41 -08:00
Brian Behlendorf 936c377e4f Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:38 -08:00
Brian Behlendorf 41016312ae Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 10:18:36 -08:00
Brian Behlendorf a6067cac5e Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:32 -08:00
Brian Behlendorf cee42006e5 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 10:18:30 -08:00
Brian Behlendorf c5f98d9c11 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:26 -08:00
Brian Behlendorf 15537ec2bd Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 10:18:24 -08:00
Brian Behlendorf 642fcb21a7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:21 -08:00
Brian Behlendorf ec36f17be6 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 10:18:19 -08:00
Brian Behlendorf 143bd1614e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:16 -08:00
Brian Behlendorf 8a2224a2af Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 10:18:13 -08:00
Brian Behlendorf 9de4108779 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 3e2e5c4535 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 88251643d7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf a68af79057 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf d4c39af7a6 Re-add KM_PUSHPAGE 2008-12-19 10:15:52 -08:00
Brian Behlendorf 330840ff2e Re-add KM_PUSHPAGE 2008-12-19 10:15:27 -08:00
Brian Behlendorf b630c17896 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 10:11:32 -08:00
Brian Behlendorf b6d881a293 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:11:30 -08:00
Brian Behlendorf 75b98b396b Add missing VM types 2008-12-19 10:09:35 -08:00
Brian Behlendorf 33805f8ef3 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 10:03:33 -08:00
Brian Behlendorf 67b265106b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:03:31 -08:00
Brian Behlendorf 8578673221 Add DTRACE_PROBE(a) macro 2008-12-19 10:01:38 -08:00
Brian Behlendorf 7db832358a Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-19 09:54:51 -08:00
Brian Behlendorf 857e8ea1c0 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:50 -08:00
Brian Behlendorf 3845f85e42 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 09:54:48 -08:00
Brian Behlendorf 1b163c7db9 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:44 -08:00
Brian Behlendorf fa6f423f31 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 09:54:43 -08:00
Brian Behlendorf fbd1ea4583 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:39 -08:00
Brian Behlendorf b1cbded73a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 09:54:37 -08:00
Brian Behlendorf be8c2f3d9d Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:33 -08:00
Brian Behlendorf cd0966054f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 09:54:32 -08:00
Brian Behlendorf 82db9e46fa Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:28 -08:00
Brian Behlendorf e60107ab95 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 09:54:26 -08:00
Brian Behlendorf 531670e928 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:23 -08:00
Brian Behlendorf b164745a8d Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 09:54:21 -08:00
Brian Behlendorf dd702391f8 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:17 -08:00