7e3a808c8d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-04 15:56:53 -07:00
f73936be84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-04 15:56:50 -07:00
d38d5d88a1
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-04 15:56:40 -07:00
1bfe0d5177
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-04 15:56:36 -07:00
ed8ca1a368
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-04 15:56:25 -07:00
a089c64daa
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-04 15:56:23 -07:00
f2018fdf21
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-04 15:56:21 -07:00
8e9957355b
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-04 15:56:01 -07:00
a7a6539d95
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-04 15:55:57 -07:00
56204aacac
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-04 15:55:55 -07:00
671da4b5ff
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-04 15:55:36 -07:00
c3c87bf545
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-08-04 15:55:34 -07:00
dd53e58506
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-04 15:55:23 -07:00
295499a5b0
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-04 15:55:18 -07:00
fd83b0b954
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-04 15:55:08 -07:00
e86a0e8ad1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-04 15:55:06 -07:00
886dfcc372
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-04 15:54:55 -07:00
d41ab91034
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-04 15:54:53 -07:00
b2c0d00644
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-04 15:54:43 -07:00
74f5a110b7
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-04 15:54:35 -07:00
72fc3eca7e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-04 15:54:25 -07:00
d0113c9769
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-04 15:54:22 -07:00
f88cbd6535
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-04 15:54:21 -07:00
8c28ed9bff
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-08-04 15:54:19 -07:00
d85e9f79ce
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-08-04 15:54:18 -07:00
adcc63f658
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-08-04 15:54:17 -07:00
2ee19b34ea
Refresh ChangeLog
2009-08-04 15:45:48 -07:00
7069d048a0
Revert kthreads based on pthread thread specific data due to failure.
...
With this patch applied I get the following failure 100% of the time,
I'd prefer to debug it and keep moving forward but I do not have the
time right now so I'm reverting the patch to the version which worked.
Ricardo please fix.
(gdb) bt
0 ztest_dmu_write_parallel (za=0x2aaaac898960) at
../../cmd/ztest/ztest.c:2566
1 0x0000000000405a79 in ztest_thread (arg=<value optimized out>)
at ../../cmd/ztest/ztest.c:3862
2 0x00002b2e6a7a841d in zk_thread_helper (arg=<value optimized out>)
at ../../lib/libzpool/kernel.c:131
3 0x000000379be06367 in start_thread (arg=<value optimized out>)
at pthread_create.c:297
4 0x000000379b2d30ad in clone () from /lib64/libc.so.6
2009-08-04 15:42:24 -07:00
f135998956
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-04 15:10:06 -07:00
725abdb10d
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-04 15:10:02 -07:00
cb5408adbb
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-04 15:09:52 -07:00
a5f5d81e31
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-04 15:09:49 -07:00
9b5404715c
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-04 15:09:38 -07:00
f680d2de98
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-04 15:09:36 -07:00
7c68119564
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-04 15:09:24 -07:00
393bfcf45e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-04 15:09:20 -07:00
7842143168
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-04 15:09:09 -07:00
f03ec3ce62
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-04 15:09:05 -07:00
1426a63c31
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-04 15:08:54 -07:00
8c1b861ba9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-04 15:08:52 -07:00
71879f555d
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-04 15:08:41 -07:00
71aa5fd850
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-04 15:08:39 -07:00
20bb3fe62e
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-04 15:08:29 -07:00
58c12640d5
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-04 15:08:26 -07:00
5cf56498b1
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-04 15:08:16 -07:00
48c94a9ee6
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-04 15:08:14 -07:00
a2d606d9a3
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-04 15:08:03 -07:00
510ef9a73f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-04 15:08:00 -07:00
c1fef98dc6
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-04 15:07:49 -07:00
118c1e9bfe
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-04 15:07:43 -07:00
Brian Behlendorf