Brian Behlendorf
|
c9cff73d9e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
cmd/zpool/zpool_main.c
|
2009-03-16 10:32:12 -07:00 |
|
Brian Behlendorf
|
798226a839
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-16 10:30:33 -07:00 |
|
Brian Behlendorf
|
be112b3f57
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-16 10:30:31 -07:00 |
|
Brian Behlendorf
|
5ee8a85ba6
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-03-16 10:30:27 -07:00 |
|
Brian Behlendorf
|
ab8dbc4a7d
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-03-16 10:12:02 -07:00 |
|
Brian Behlendorf
|
9818e69640
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2009-03-16 10:12:01 -07:00 |
|
Brian Behlendorf
|
bb29348bc2
|
New TopGit dependency: fix-deadcode
|
2009-03-16 10:11:57 -07:00 |
|
Brian Behlendorf
|
2924858552
|
Remove two self referential functions.
Newer versions of gcc (4.3.0) detected the following unused
code segments.
|
2009-03-16 10:02:06 -07:00 |
|
Brian Behlendorf
|
7370f3991e
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:01:44 -07:00 |
|
Brian Behlendorf
|
6856f493c7
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-13 11:01:42 -07:00 |
|
Brian Behlendorf
|
98539e4afc
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:01:30 -07:00 |
|
Brian Behlendorf
|
b289a33e68
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-13 11:01:27 -07:00 |
|
Brian Behlendorf
|
0bb384e1a5
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:01:19 -07:00 |
|
Brian Behlendorf
|
f3ffd5133b
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-13 11:01:17 -07:00 |
|
Brian Behlendorf
|
986d9a0adf
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:01:09 -07:00 |
|
Brian Behlendorf
|
5e2fde78a3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-13 11:01:07 -07:00 |
|
Brian Behlendorf
|
653e0f02b0
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:00:56 -07:00 |
|
Brian Behlendorf
|
abfd24f708
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-13 11:00:47 -07:00 |
|
Brian Behlendorf
|
f4570a16ac
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:00:39 -07:00 |
|
Brian Behlendorf
|
faa835e9de
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-13 11:00:37 -07:00 |
|
Brian Behlendorf
|
fdc5439642
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:00:29 -07:00 |
|
Brian Behlendorf
|
335ce374d2
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-13 11:00:27 -07:00 |
|
Brian Behlendorf
|
dc7e11c142
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:00:18 -07:00 |
|
Brian Behlendorf
|
0c058d349e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-13 11:00:14 -07:00 |
|
Brian Behlendorf
|
a7e44fdc75
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-13 11:00:06 -07:00 |
|
Brian Behlendorf
|
339553bdea
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-13 11:00:03 -07:00 |
|
Brian Behlendorf
|
f3e665bef8
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:59:55 -07:00 |
|
Brian Behlendorf
|
a4f8aecbe8
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-13 10:59:53 -07:00 |
|
Brian Behlendorf
|
5db7d213df
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:59:45 -07:00 |
|
Brian Behlendorf
|
ab636c01ec
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-13 10:59:42 -07:00 |
|
Brian Behlendorf
|
83443983a2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:59:34 -07:00 |
|
Brian Behlendorf
|
344e59a582
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-13 10:59:32 -07:00 |
|
Brian Behlendorf
|
b60dd0bdd7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-13 10:59:31 -07:00 |
|
Brian Behlendorf
|
198da4439c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:59:17 -07:00 |
|
Brian Behlendorf
|
f21bd57c48
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-13 10:59:15 -07:00 |
|
Brian Behlendorf
|
adf984639d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-13 10:59:14 -07:00 |
|
Brian Behlendorf
|
dfd9be6dc4
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:59:00 -07:00 |
|
Brian Behlendorf
|
d93546b1d3
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-13 10:58:58 -07:00 |
|
Brian Behlendorf
|
5f50d10a32
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:58:50 -07:00 |
|
Brian Behlendorf
|
e815162f7c
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-13 10:58:45 -07:00 |
|
Brian Behlendorf
|
8b82591839
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:58:37 -07:00 |
|
Brian Behlendorf
|
ff514102dc
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-13 10:58:34 -07:00 |
|
Brian Behlendorf
|
3910e31f6e
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:58:27 -07:00 |
|
Brian Behlendorf
|
046a7b3333
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-13 10:58:24 -07:00 |
|
Brian Behlendorf
|
c1d2815ba4
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:58:16 -07:00 |
|
Brian Behlendorf
|
d3afa01aa9
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-13 10:58:14 -07:00 |
|
Brian Behlendorf
|
ac56fb7bd9
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:58:02 -07:00 |
|
Brian Behlendorf
|
fe2e7d8309
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-13 10:57:58 -07:00 |
|
Brian Behlendorf
|
d7f60ff869
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-13 10:57:50 -07:00 |
|
Brian Behlendorf
|
648bbdebbe
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-13 10:57:47 -07:00 |