01db66d450
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-03-09 14:19:41 -08:00
d5b5666f2e
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-03-09 14:19:40 -08:00
f19f8e5dcc
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-03-09 14:19:40 -08:00
b1a86e0752
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-03-09 14:19:39 -08:00
5fc733bc97
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-03-09 14:19:39 -08:00
8515a07c0f
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-03-09 14:19:38 -08:00
881d65ec2b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-09 14:19:37 -08:00
60a00a6316
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-03-09 14:19:36 -08:00
d0389e24d5
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-03-09 14:19:36 -08:00
774f7c02b1
Ignore unsigned module build products
...
Along with the addition of signed kernel modules in newer kernel
we have a few new build products we need to ignore. LKLM has the
whole thread for those interested: http://lkml.org/lkml/2007/2/14/164
2010-03-09 14:14:09 -08:00
d285c096c9
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-01-08 11:39:27 -08:00
da35bd5b60
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-01-08 11:39:26 -08:00
050c1617d8
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-01-08 11:39:26 -08:00
3d5d35b616
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-01-08 11:39:26 -08:00
34c0ae76d9
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-01-08 11:39:25 -08:00
fe9ad9171a
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-01-08 11:39:25 -08:00
4d11d8d3ef
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-01-08 11:39:24 -08:00
4fc3a7710c
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-01-08 11:39:24 -08:00
259647c1f1
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-01-08 11:39:23 -08:00
6ef95d5968
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-01-08 11:39:23 -08:00
233a1d9191
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-01-08 11:39:23 -08:00
385839654a
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-01-08 11:39:22 -08:00
5bd6eac343
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-01-08 11:39:22 -08:00
c6b28bd987
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-01-08 11:39:22 -08:00
1248d0da1a
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-01-08 11:39:21 -08:00
f70a3b3889
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-01-08 11:39:21 -08:00
39235e0172
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-01-08 11:39:20 -08:00
9b32e1cc61
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-01-08 11:39:20 -08:00
9aa7432a39
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-01-08 11:39:20 -08:00
94872fcdab
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-01-08 11:39:19 -08:00
c5a22252ab
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-01-08 11:39:19 -08:00
9002f847df
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-01-08 11:39:19 -08:00
365c47de76
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-01-08 11:39:18 -08:00
f2607bbb8f
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-01-08 11:39:18 -08:00
e02d36ad39
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-01-08 11:39:17 -08:00
93befe62be
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-01-08 11:39:17 -08:00
c3835d1483
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-01-08 11:39:17 -08:00
68fc990a4b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-01-08 11:39:16 -08:00
8513efcadd
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-01-08 11:39:16 -08:00
c1d363770f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-01-08 11:39:16 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
b58747a2e2
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-12-18 14:31:21 -08:00
70ddc1393f
No inline to keep dmu_recv_stream() stack frame less than 1024 bytes.
...
Recent builds against 2.6.31 flagged dmu_recv_stream() as stack heavy.
As a quick simple way to resolve this I'm preventing the inlining of
certain functions which gcc will inline here because this is the only
place they are called. Futher analysis of this function should be
performed to futher reduce its stack usage.
2009-12-18 14:22:02 -08:00
73672e0b66
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2009-12-11 16:22:15 -08:00
ef72feceef
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-12-11 16:22:15 -08:00
39ea68ffcc
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-12-11 16:22:13 -08:00
9e22d4e163
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-12-11 16:22:13 -08:00
13ef957f1f
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-12-11 16:22:12 -08:00
3951938094
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-12-11 16:22:12 -08:00
da80b11b25
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-12-11 16:22:10 -08:00
Brian Behlendorf