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
|
818cd4262f
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-06 10:12:36 -08:00 |
|
Brian Behlendorf
|
eafcafe72f
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-06 10:12:35 -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
|
3d75044b97
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-02-05 15:23:24 -08:00 |
|
Brian Behlendorf
|
94da8e6573
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-02-05 15:23:22 -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 |
|
Brian Behlendorf
|
9adba79cc6
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-02-05 15:22:45 -08:00 |
|
Brian Behlendorf
|
2b64e48491
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:41 -08:00 |
|
Brian Behlendorf
|
d01abcefda
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-02-05 15:22:40 -08:00 |
|
Brian Behlendorf
|
c17bb19c4e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:37 -08:00 |
|
Brian Behlendorf
|
ef428e00b0
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-02-05 15:22:35 -08:00 |
|
Brian Behlendorf
|
e4cdcb39a6
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:31 -08:00 |
|
Brian Behlendorf
|
0881aceff2
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-02-05 15:22:30 -08:00 |
|
Brian Behlendorf
|
a35ce3fe73
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:26 -08:00 |
|
Brian Behlendorf
|
2c7b99e0a7
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-02-05 15:22:25 -08:00 |
|
Brian Behlendorf
|
1980d4300b
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:21 -08:00 |
|
Brian Behlendorf
|
6ef3152d13
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-02-05 15:22:20 -08:00 |
|
Brian Behlendorf
|
2221b5e787
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-02-05 15:22:19 -08:00 |
|
Brian Behlendorf
|
0c1085f18c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:14 -08:00 |
|
Brian Behlendorf
|
7ab0724af3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-02-05 15:22:12 -08:00 |
|
Brian Behlendorf
|
831e788b86
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-05 15:22:11 -08:00 |
|
Brian Behlendorf
|
37748b66ee
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:06 -08:00 |
|
Brian Behlendorf
|
d797ed25d4
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-02-05 15:22:04 -08:00 |
|
Brian Behlendorf
|
f013740a48
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:22:00 -08:00 |
|
Brian Behlendorf
|
78a1403714
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-02-05 15:21:59 -08:00 |
|
Brian Behlendorf
|
6849e46b4f
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:21:55 -08:00 |
|
Brian Behlendorf
|
2be21dda4a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-02-05 15:21:54 -08:00 |
|
Brian Behlendorf
|
45dd60a3ff
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-02-05 15:21:50 -08:00 |