Brian Behlendorf
|
24a0f6bbaf
|
Merge commit 'refs/top-bases/top' into top
|
2009-02-20 22:32:36 -08:00 |
|
Brian Behlendorf
|
1efe435474
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-20 22:32:34 -08:00 |
|
Brian Behlendorf
|
d742ab3e25
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-20 22:32:32 -08:00 |
|
Brian Behlendorf
|
c3d57d1ec7
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-20 22:32:30 -08:00 |
|
Brian Behlendorf
|
a31814f47b
|
Further profile infrastructure
|
2009-02-20 22:27:18 -08:00 |
|
Brian Behlendorf
|
d72c94f474
|
Merge commit 'refs/top-bases/top' into top
|
2009-02-20 14:33:33 -08:00 |
|
Brian Behlendorf
|
986591a09a
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-20 14:33:30 -08:00 |
|
Brian Behlendorf
|
694b0e531c
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-20 14:33:28 -08:00 |
|
Brian Behlendorf
|
7eeec4808a
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-20 14:33:26 -08:00 |
|
Brian Behlendorf
|
4d28f29b6c
|
Update profile scripts with additional upcalls for fine grained profiling
|
2009-02-20 14:28:00 -08:00 |
|
Brian Behlendorf
|
b53b3a6865
|
Merge commit 'refs/top-bases/top' into top
|
2009-02-19 14:57:35 -08:00 |
|
Brian Behlendorf
|
2c7ad95794
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-19 14:57:33 -08:00 |
|
Brian Behlendorf
|
64d4cd1f1b
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-19 14:57:30 -08:00 |
|
Brian Behlendorf
|
29946892d9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-19 14:57:29 -08:00 |
|
Brian Behlendorf
|
ddfa570f42
|
Initial update to support zpios.sh profiling option.
|
2009-02-19 14:51:40 -08:00 |
|
Brian Behlendorf
|
168730fab9
|
Merge commit 'refs/top-bases/top' into top
|
2009-02-19 14:41:06 -08:00 |
|
Brian Behlendorf
|
4f49b489a1
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-19 14:41:04 -08:00 |
|
Brian Behlendorf
|
c862c6bc49
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-19 14:41:01 -08:00 |
|
Brian Behlendorf
|
43fb0282da
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-19 14:41:00 -08:00 |
|
Brian Behlendorf
|
d51fcd107f
|
Remove useless run_args->regions check which was always true
|
2009-02-19 14:35:41 -08:00 |
|
Brian Behlendorf
|
434eae210c
|
Merge commit 'refs/top-bases/top' into top
|
2009-02-19 13:58:33 -08:00 |
|
Brian Behlendorf
|
9c27e585f6
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-19 13:58:31 -08:00 |
|
Brian Behlendorf
|
d7f9d62a78
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-19 13:58:28 -08:00 |
|
Brian Behlendorf
|
023a02025f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-19 13:58:27 -08:00 |
|
Brian Behlendorf
|
5ae73585fb
|
Cleanup zpios option handling
|
2009-02-19 13:53:17 -08:00 |
|
Brian Behlendorf
|
91af0269ec
|
Merge commit 'refs/top-bases/top' into top
|
2009-02-19 13:02:07 -08:00 |
|
Brian Behlendorf
|
f951aec719
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-19 13:02:05 -08:00 |
|
Brian Behlendorf
|
8bfeb2b6a1
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-19 13:02:02 -08:00 |
|
Brian Behlendorf
|
d3f070026f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-19 13:02:01 -08:00 |
|
Brian Behlendorf
|
23710f1308
|
Minor zpios cleanup plus addition of --nowait feature
|
2009-02-19 12:56:50 -08:00 |
|
Brian Behlendorf
|
9300f345e4
|
Merge commit 'refs/top-bases/top' into top
|
2009-02-18 16:41:01 -08:00 |
|
Brian Behlendorf
|
90026d85c4
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-18 16:40:57 -08:00 |
|
Brian Behlendorf
|
e68a4342a6
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-18 16:40:54 -08:00 |
|
Brian Behlendorf
|
d01a5802ef
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:40:51 -08:00 |
|
Brian Behlendorf
|
f2c0b3f2a6
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-02-18 16:40:47 -08:00 |
|
Brian Behlendorf
|
fcc5bc121d
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:40:37 -08:00 |
|
Brian Behlendorf
|
c0fce9bde6
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-02-18 16:40:34 -08:00 |
|
Brian Behlendorf
|
8add3a726a
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:40:25 -08:00 |
|
Brian Behlendorf
|
3a79a1f922
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-02-18 16:40:22 -08:00 |
|
Brian Behlendorf
|
7a8825ef7f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:40:13 -08:00 |
|
Brian Behlendorf
|
b1eaefd390
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-02-18 16:40:10 -08:00 |
|
Brian Behlendorf
|
9a985e1631
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:40:01 -08:00 |
|
Brian Behlendorf
|
a2b17c5744
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-02-18 16:39:57 -08:00 |
|
Brian Behlendorf
|
d6ca5f4b22
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:39:49 -08:00 |
|
Brian Behlendorf
|
283b744e89
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-02-18 16:39:45 -08:00 |
|
Brian Behlendorf
|
5026284b48
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:39:36 -08:00 |
|
Brian Behlendorf
|
68816d820e
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-02-18 16:39:31 -08:00 |
|
Brian Behlendorf
|
c301f6309a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:39:21 -08:00 |
|
Brian Behlendorf
|
d09c4a4c80
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-02-18 16:39:18 -08:00 |
|
Brian Behlendorf
|
6bf6f62d98
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:39:09 -08:00 |