Brian Behlendorf
|
d17bbef963
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-07-14 16:56:43 -07:00 |
|
Brian Behlendorf
|
c8782fbd0a
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:56:39 -07:00 |
|
Brian Behlendorf
|
8258757e75
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-14 16:56:35 -07:00 |
|
Brian Behlendorf
|
506f20183e
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:56:22 -07:00 |
|
Brian Behlendorf
|
adf7187906
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-14 16:56:17 -07:00 |
|
Brian Behlendorf
|
f4a071a80e
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:56:04 -07:00 |
|
Brian Behlendorf
|
f7ea79b354
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-14 16:56:00 -07:00 |
|
Brian Behlendorf
|
d8e0f98f84
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:55:46 -07:00 |
|
Brian Behlendorf
|
ee2dddb6a4
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-14 16:55:41 -07:00 |
|
Brian Behlendorf
|
24e9f6bc06
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:55:25 -07:00 |
|
Brian Behlendorf
|
1c396c4600
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-14 16:55:21 -07:00 |
|
Brian Behlendorf
|
8ad2168bba
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:55:06 -07:00 |
|
Brian Behlendorf
|
c99aae5027
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-14 16:55:02 -07:00 |
|
Brian Behlendorf
|
f080a97003
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:54:46 -07:00 |
|
Brian Behlendorf
|
46ffc6bfd1
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-14 16:54:39 -07:00 |
|
Brian Behlendorf
|
bdf6d7de48
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:54:26 -07:00 |
|
Brian Behlendorf
|
3fb543951a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-14 16:54:21 -07:00 |
|
Brian Behlendorf
|
ec29ecf53d
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:54:08 -07:00 |
|
Brian Behlendorf
|
9da48a9e80
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-14 16:54:02 -07:00 |
|
Brian Behlendorf
|
581ac61ff9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:53:47 -07:00 |
|
Brian Behlendorf
|
f8103c5514
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-14 16:53:42 -07:00 |
|
Brian Behlendorf
|
6aeb47e897
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:53:29 -07:00 |
|
Brian Behlendorf
|
1c97eab257
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-14 16:53:24 -07:00 |
|
Brian Behlendorf
|
c18e8c00a2
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:53:04 -07:00 |
|
Brian Behlendorf
|
c22614ed12
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-14 16:52:59 -07:00 |
|
Brian Behlendorf
|
2c49c6f866
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:52:46 -07:00 |
|
Brian Behlendorf
|
dba4d1e90c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-14 16:52:40 -07:00 |
|
Brian Behlendorf
|
73691ea2f8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-14 16:52:38 -07:00 |
|
Brian Behlendorf
|
451c1192af
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:52:11 -07:00 |
|
Brian Behlendorf
|
1fab39d126
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-14 16:52:04 -07:00 |
|
Brian Behlendorf
|
bd428bf511
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-14 16:52:02 -07:00 |
|
Brian Behlendorf
|
fba92af9a8
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:51:37 -07:00 |
|
Brian Behlendorf
|
a921899aae
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-14 16:51:32 -07:00 |
|
Brian Behlendorf
|
63c3ce52ab
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:51:18 -07:00 |
|
Brian Behlendorf
|
d3cc17b4ed
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-14 16:51:11 -07:00 |
|
Brian Behlendorf
|
6ae62e27f5
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:50:58 -07:00 |
|
Brian Behlendorf
|
56045106bd
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-14 16:50:54 -07:00 |
|
Brian Behlendorf
|
520c60cfff
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:50:40 -07:00 |
|
Brian Behlendorf
|
f352c08e28
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-14 16:50:36 -07:00 |
|
Brian Behlendorf
|
50961f7ac4
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:50:19 -07:00 |
|
Brian Behlendorf
|
5756cf15f5
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-14 16:50:14 -07:00 |
|
Brian Behlendorf
|
7f1208e4d2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:50:01 -07:00 |
|
Brian Behlendorf
|
68589ed1e1
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-14 16:49:54 -07:00 |
|
Brian Behlendorf
|
5b0851cbdb
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-14 16:49:36 -07:00 |
|
Brian Behlendorf
|
6ff8305529
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-14 16:49:31 -07:00 |
|
Brian Behlendorf
|
5753d78dcd
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-14 16:49:29 -07:00 |
|
Brian Behlendorf
|
e9d7526fb3
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-07-14 16:49:27 -07:00 |
|
Brian Behlendorf
|
407a09cf3e
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-07-14 16:49:23 -07:00 |
|
Brian Behlendorf
|
8d55cf8c97
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-07-14 16:49:22 -07:00 |
|
Brian Behlendorf
|
5ef898a106
|
Update TODO by removing out of date failure modes.
From what I've seen so far the pthreads cleanup has addressed
most/all of the pthread_* related crashes in ztest.
|
2009-07-14 16:36:28 -07:00 |