9bbf8f1761
Resolve conflict with fix-dnode-cons
2009-03-19 15:02:05 -07:00
ab8dbc4a7d
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-03-16 10:12:02 -07:00
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
bb29348bc2
New TopGit dependency: fix-deadcode
2009-03-16 10:11:57 -07:00
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
c4e10eb3df
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-03-12 15:21:30 -07:00
21a51bafc8
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-03-12 15:21:30 -07:00
56aaaa2617
New TopGit dependency: fix-strncat
2009-03-12 15:21:27 -07:00
f1f9c50dd9
Add fix-strncat branch which corrects a buffer overrun.
2009-03-12 15:20:26 -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
1e606f156b
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-02-18 14:30:43 -08:00
4e50779f44
Merge branch 'fix-list' into refs/top-bases/fix-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:30:38 -08:00
dbc3a5ec55
Merge commit 'refs/top-bases/fix-list' into fix-list
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:29:48 -08:00
4cc0df153d
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-02-18 14:29:24 -08:00
3ef12f42a2
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-02-18 14:29:23 -08:00
f257cc3a9e
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-02-18 14:29:20 -08:00
7fe1b71533
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-02-18 14:29:19 -08:00
56aabda0f9
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-02-18 14:29:16 -08:00
d3bf596f03
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-02-18 14:29:16 -08:00
463205c1bb
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-02-18 14:29:12 -08:00
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
baf389bedc
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-02-18 14:28:46 -08:00
0c0f306f14
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-02-18 14:28:46 -08:00
40839628e9
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-02-18 14:28:43 -08:00
f3f9572ef9
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-02-18 14:28:42 -08:00
fa06351125
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-02-18 14:28:39 -08:00
109a1d5b16
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-02-18 14:28:38 -08:00
224985aa70
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2009-02-18 14:28:34 -08:00
0dd5d4dae3
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-02-18 14:28:34 -08:00
e3f59d5034
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-02-18 14:28:31 -08:00
d6e8154947
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-02-18 14:28:30 -08:00
145bd84478
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-02-18 14:28:28 -08:00
404fd8578f
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-02-18 14:28:27 -08:00
a6fe6c5a73
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2009-02-18 14:28:24 -08:00
d190a5b9bd
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-02-18 14:28:23 -08:00
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -08:00
3ac1fca8dc
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-02-18 14:27:31 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
626939c8f1
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-01-26 22:01:12 -08:00
3d8d90cabd
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-01-26 22:01:12 -08:00
1bc61f560c
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-26 22:01:12 -08:00
bd1377acda
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-01-26 22:01:11 -08:00
ab471b80aa
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-01-26 22:01:10 -08:00
8c29491191
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-01-26 22:01:09 -08:00
9adbf76871
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-01-26 22:01:09 -08:00
5f8aaed66f
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-01-26 22:01:08 -08:00
7cce398964
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-26 22:01:07 -08:00
542b40d70a
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
2009-01-26 22:01:06 -08:00
Brian Behlendorf