Brian Behlendorf
|
d51fcd107f
|
Remove useless run_args->regions check which was always true
|
2009-02-19 14:35:41 -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
|
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
|
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 |
|
Brian Behlendorf
|
aab28d7a6e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-02-18 16:39:06 -08:00 |
|
Brian Behlendorf
|
7fb9b38b35
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:38:57 -08:00 |
|
Brian Behlendorf
|
a21e67a4af
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-02-18 16:38:54 -08:00 |
|
Brian Behlendorf
|
e5950641e2
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:38:42 -08:00 |
|
Brian Behlendorf
|
359141b50e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-02-18 16:38:40 -08:00 |
|
Brian Behlendorf
|
cdbb12e5c5
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:38:31 -08:00 |
|
Brian Behlendorf
|
a983057c58
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-02-18 16:38:28 -08:00 |
|
Brian Behlendorf
|
eac636b639
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:38:19 -08:00 |
|
Brian Behlendorf
|
2cbe1d0785
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-02-18 16:38:16 -08:00 |
|
Brian Behlendorf
|
fab643a25b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-02-18 16:38:15 -08:00 |
|
Brian Behlendorf
|
5957fa4c9c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:37:59 -08:00 |
|
Brian Behlendorf
|
ac79872526
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-02-18 16:37:56 -08:00 |
|
Brian Behlendorf
|
87245deaab
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-18 16:37:54 -08:00 |
|
Brian Behlendorf
|
7cc355671b
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:37:38 -08:00 |
|
Brian Behlendorf
|
a922810637
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-02-18 16:37:35 -08:00 |
|
Brian Behlendorf
|
d7f98447e7
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:37:26 -08:00 |
|
Brian Behlendorf
|
986174d1e0
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-02-18 16:37:22 -08:00 |
|
Brian Behlendorf
|
9ec4c5282a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:37:13 -08:00 |
|
Brian Behlendorf
|
4b53631e65
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-02-18 16:37:10 -08:00 |
|
Brian Behlendorf
|
57b14e008e
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:37:01 -08:00 |
|
Brian Behlendorf
|
7e7d1134be
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-02-18 16:36:57 -08:00 |
|
Brian Behlendorf
|
9c7ef97372
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:36:49 -08:00 |
|
Brian Behlendorf
|
a8edc189e5
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-02-18 16:36:45 -08:00 |
|
Brian Behlendorf
|
ffebd4eaa3
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:36:37 -08:00 |
|
Brian Behlendorf
|
ce17ae9e94
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-02-18 16:36:34 -08:00 |
|
Brian Behlendorf
|
04f4045077
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-18 16:36:25 -08:00 |
|
Brian Behlendorf
|
e898182f62
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-02-18 16:36:21 -08:00 |
|
Brian Behlendorf
|
b57a283336
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 16:36:19 -08:00 |