9bee4c8c52
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 09:27:04 -07:00
e18d7c291b
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:57 -07:00
a30cf613c2
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-12 09:26:55 -07:00
dc5e9701e7
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:43 -07:00
71ba49634e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-12 09:26:40 -07:00
66f49de875
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:34 -07:00
2f4bc3c0e2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-12 09:26:32 -07:00
87d1dd9762
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:25 -07:00
461c7197eb
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 09:26:23 -07:00
1b92460e6d
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:16 -07:00
1e133994d2
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 09:26:14 -07:00
60d3c4105d
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:07 -07:00
ade1d13ec2
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 09:26:04 -07:00
037e25d9f1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 09:26:02 -07:00
b72f0b9075
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-12 09:25:50 -07:00
26488113c3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 09:25:48 -07:00
bbf0ae992d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 09:25:47 -07:00
966674cf3c
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-12 09:25:34 -07:00
a35c501efd
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-12 09:25:31 -07:00
e3b1adc7ef
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-12 09:25:24 -07:00
3c46798924
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-12 09:25:22 -07:00
2a3eee1a22
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-12 09:25:16 -07:00
13742b3b80
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 09:25:14 -07:00
2f1d395d2a
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-12 09:25:07 -07:00
cb931a10ff
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 09:25:05 -07:00
dfe37e9d50
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-12 09:24:54 -07:00
4f99141af2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 09:24:51 -07:00
744709b0ef
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-12 09:24:44 -07:00
eafd97fa24
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-12 09:24:42 -07:00
308a05919a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 09:24:35 -07:00
eae2603a7d
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 09:24:33 -07:00
2e9568b6be
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 09:24:32 -07:00
fba88e48f2
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 09:24:31 -07:00
1e8c8e1d25
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-03-12 09:24:30 -07:00
50c68324fe
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-12 09:24:29 -07:00
9de6723b83
ztest_resume should be ztest_resume_thread in pthread_create()
...
Fix an accidental bug introducted by the pthreads changes. When creating
a resume thread the handler function was accidentally changed from
ztest_resume to ztest_resume_thread. There's a decent chance this
may explain some/all of the crashes that have be observed running
ztest. This issue was exposed and easily fixed once the -Wno-unused
check was removed from the build system. Happily at least one real
bug fix resulted from that cleanup.
2009-03-12 09:13:40 -07:00
da4d2eea9d
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-11 23:10:06 -07:00
73db9f622c
Pull unused err variable under HAVE_DM_INUSE_SWAP ifdef.
2009-03-11 23:05:42 -07:00
06fd9e48a0
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 23:00:04 -07:00
8aac8753f4
Move 4 unused functions under HAVE_ZPL until implemented.
2009-03-11 22:55:45 -07:00
df86f94c91
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:38 -07:00
785f416420
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 22:50:36 -07:00
0d19b2613b
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:31 -07:00
7dda95296c
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 22:50:29 -07:00
34e741934d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:23 -07:00
b5a8a9b849
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-11 22:50:21 -07:00
5fdf7cba2c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:16 -07:00
267ddd3d1d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 22:50:13 -07:00
7e02741bb3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:04 -07:00
ef003a41c3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 22:50:02 -07:00
Brian Behlendorf