Brian Behlendorf
|
cdb365caff
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:51:48 -08:00 |
|
Brian Behlendorf
|
e098151299
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-02-06 11:51:46 -08:00 |
|
Brian Behlendorf
|
24e2ee3b75
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:51:42 -08:00 |
|
Brian Behlendorf
|
29b7f3320e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-02-06 11:51:41 -08:00 |
|
Brian Behlendorf
|
7cb3453624
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:51:37 -08:00 |
|
Brian Behlendorf
|
06caccef67
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-02-06 11:51:36 -08:00 |
|
Brian Behlendorf
|
034fd8f29f
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:51:32 -08:00 |
|
Brian Behlendorf
|
26dcbe649c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-02-06 11:51:30 -08:00 |
|
Brian Behlendorf
|
2471f3af70
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:51:27 -08:00 |
|
Brian Behlendorf
|
d1fd6b56b8
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-02-06 11:51:25 -08:00 |
|
Brian Behlendorf
|
5b4d71e1d4
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:51:21 -08:00 |
|
Brian Behlendorf
|
8ab1612af3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-02-06 11:51:20 -08:00 |
|
Brian Behlendorf
|
6689d1ea27
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:51:16 -08:00 |
|
Brian Behlendorf
|
cbbbf5d19d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-02-06 11:51:15 -08:00 |
|
Brian Behlendorf
|
b11b5795de
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-02-06 11:51:14 -08:00 |
|
Brian Behlendorf
|
b8af058e01
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:51:08 -08:00 |
|
Brian Behlendorf
|
ef3aa0dd24
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-02-06 11:51:06 -08:00 |
|
Brian Behlendorf
|
562a7cf544
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-06 11:51:06 -08:00 |
|
Brian Behlendorf
|
bd6defb9b0
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:50:59 -08:00 |
|
Brian Behlendorf
|
c6a24ab81d
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-02-06 11:50:58 -08:00 |
|
Brian Behlendorf
|
885339815f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:50:54 -08:00 |
|
Brian Behlendorf
|
59c2b94da7
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-02-06 11:50:53 -08:00 |
|
Brian Behlendorf
|
92a8fb0468
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:50:49 -08:00 |
|
Brian Behlendorf
|
3ebe48ff70
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-02-06 11:50:47 -08:00 |
|
Brian Behlendorf
|
587df31527
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:50:44 -08:00 |
|
Brian Behlendorf
|
fcab68fa59
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-02-06 11:50:42 -08:00 |
|
Brian Behlendorf
|
7981e76da1
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:50:38 -08:00 |
|
Brian Behlendorf
|
98bac1940a
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-02-06 11:50:37 -08:00 |
|
Brian Behlendorf
|
6b4478a295
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:50:33 -08:00 |
|
Brian Behlendorf
|
76a2867efe
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-02-06 11:50:32 -08:00 |
|
Brian Behlendorf
|
df7399e08b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-06 11:50:28 -08:00 |
|
Brian Behlendorf
|
001a164556
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-02-06 11:50:26 -08:00 |
|
Brian Behlendorf
|
97e40aae09
|
Add 8 basic x4550 configurations which are of interest.
|
2009-02-06 11:47:09 -08:00 |
|
Brian Behlendorf
|
b52f710397
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-06 10:12:34 -08:00 |
|
Brian Behlendorf
|
c3ec929baf
|
Ensure vmem_size() calculations are only used on __i386 or we will
missize the arch cache on 64bit machines with the SPL. This change
should probably be there in the Solaris version as well.
|
2009-02-06 10:09:20 -08:00 |
|
Brian Behlendorf
|
14fc2ebb55
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:23:21 -08:00 |
|
Brian Behlendorf
|
0aeec8eed2
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-02-05 15:23:19 -08:00 |
|
Brian Behlendorf
|
8b0bcaa9ac
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:23:16 -08:00 |
|
Brian Behlendorf
|
5337acf4c3
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-02-05 15:23:15 -08:00 |
|
Brian Behlendorf
|
fc7297c6d6
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:23:11 -08:00 |
|
Brian Behlendorf
|
f9727342ec
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-02-05 15:23:10 -08:00 |
|
Brian Behlendorf
|
d90a41bfb6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:23:06 -08:00 |
|
Brian Behlendorf
|
3d6162c0dc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-02-05 15:23:05 -08:00 |
|
Brian Behlendorf
|
651942dc7a
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:23:01 -08:00 |
|
Brian Behlendorf
|
fefb0d97ea
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-02-05 15:23:00 -08:00 |
|
Brian Behlendorf
|
80b8b8bba8
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:56 -08:00 |
|
Brian Behlendorf
|
ced7470c3e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-02-05 15:22:55 -08:00 |
|
Brian Behlendorf
|
5d00e36ab5
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:51 -08:00 |
|
Brian Behlendorf
|
eee789700c
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-02-05 15:22:50 -08:00 |
|
Brian Behlendorf
|
fff5d66547
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:46 -08:00 |