Brian Behlendorf
|
6da3046db1
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:57:11 -08:00 |
|
Brian Behlendorf
|
48827e91d7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-16 12:57:10 -08:00 |
|
Brian Behlendorf
|
4366ee7ed2
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:57:07 -08:00 |
|
Brian Behlendorf
|
c809973a93
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-16 12:57:05 -08:00 |
|
Brian Behlendorf
|
0663910b5b
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:57:02 -08:00 |
|
Brian Behlendorf
|
784245bb8e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-16 12:57:00 -08:00 |
|
Brian Behlendorf
|
6279f5e0c0
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:57 -08:00 |
|
Brian Behlendorf
|
1827b0b9e7
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-16 12:56:56 -08:00 |
|
Brian Behlendorf
|
527b5ad9d1
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:52 -08:00 |
|
Brian Behlendorf
|
c3e2df9489
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-16 12:56:51 -08:00 |
|
Brian Behlendorf
|
14cbef0e85
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:48 -08:00 |
|
Brian Behlendorf
|
0c1c2d0f77
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-16 12:56:46 -08:00 |
|
Brian Behlendorf
|
27594276e4
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:43 -08:00 |
|
Brian Behlendorf
|
f657c875d6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-16 12:56:42 -08:00 |
|
Brian Behlendorf
|
1f724e9b5b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-16 12:56:41 -08:00 |
|
Brian Behlendorf
|
adc0989725
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:36 -08:00 |
|
Brian Behlendorf
|
531b32d8c5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 12:56:34 -08:00 |
|
Brian Behlendorf
|
6db4c9637f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 12:56:33 -08:00 |
|
Brian Behlendorf
|
6827976add
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:27 -08:00 |
|
Brian Behlendorf
|
cbb892ee60
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-16 12:56:26 -08:00 |
|
Brian Behlendorf
|
91079732d4
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:23 -08:00 |
|
Brian Behlendorf
|
6c985f47ea
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-16 12:56:21 -08:00 |
|
Brian Behlendorf
|
acaf9ba436
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:18 -08:00 |
|
Brian Behlendorf
|
117c648ce1
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-16 12:56:16 -08:00 |
|
Brian Behlendorf
|
e01c240ba7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:13 -08:00 |
|
Brian Behlendorf
|
c1542751c3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-16 12:56:12 -08:00 |
|
Brian Behlendorf
|
8f9860afaa
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:08 -08:00 |
|
Brian Behlendorf
|
1be68e449d
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-16 12:56:07 -08:00 |
|
Brian Behlendorf
|
8a63143bb2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:56:04 -08:00 |
|
Brian Behlendorf
|
7328129dad
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-16 12:56:02 -08:00 |
|
Brian Behlendorf
|
4a56333c4c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:55:58 -08:00 |
|
Brian Behlendorf
|
0015ee9487
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-16 12:55:57 -08:00 |
|
Brian Behlendorf
|
7c761d45a8
|
Further work towards getting zpool-create working
|
2009-01-16 12:53:12 -08:00 |
|
Brian Behlendorf
|
e40814f8c4
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:27:17 -08:00 |
|
Brian Behlendorf
|
0289edb7e6
|
Update to use the zpool-create.sh script
|
2009-01-16 12:23:53 -08:00 |
|
Brian Behlendorf
|
7c98f76d30
|
Update zpios infrastructure to be more flexible
|
2009-01-16 12:19:15 -08:00 |
|
Brian Behlendorf
|
14554c497b
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:13:38 -08:00 |
|
Brian Behlendorf
|
7706861778
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-16 12:13:35 -08:00 |
|
Brian Behlendorf
|
22759114da
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:13:29 -08:00 |
|
Brian Behlendorf
|
9ffc4b5d0a
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-16 12:13:26 -08:00 |
|
Brian Behlendorf
|
c441920336
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:13:19 -08:00 |
|
Brian Behlendorf
|
6c1a4d3d98
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-16 12:13:17 -08:00 |
|
Brian Behlendorf
|
36ec198233
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:13:12 -08:00 |
|
Brian Behlendorf
|
64903e8973
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-16 12:13:11 -08:00 |
|
Brian Behlendorf
|
1686f5a792
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:13:05 -08:00 |
|
Brian Behlendorf
|
cfabdf6bda
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-16 12:13:03 -08:00 |
|
Brian Behlendorf
|
b533ad4882
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:12:55 -08:00 |
|
Brian Behlendorf
|
826f9dcba9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-16 12:12:52 -08:00 |
|
Brian Behlendorf
|
95b337d066
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-16 12:12:46 -08:00 |
|
Brian Behlendorf
|
cb7e189014
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-16 12:12:44 -08:00 |