3ec6940a9e
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2008-11-26 14:09:30 -08:00
d27f062434
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-11-26 14:09:28 -08:00
b16bda161c
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2008-11-26 14:09:27 -08:00
8b0e4193d0
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-11-26 14:09:25 -08:00
5c2337d37a
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-11-26 14:09:23 -08:00
dbf2e667e6
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 14:09:22 -08:00
00c36e7d4d
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 14:09:16 -08:00
76bf0c16c0
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 14:09:15 -08:00
e833fd4a5c
Additional buidl system cleanup. Starting to move all
...
of the kernel specific build info in to config/kernel,
likewise and user specific build flags should go in
config/user. This seems like a reasonable way to go.
2008-11-26 14:06:23 -08:00
0ba35bfd83
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-11-26 13:31:43 -08:00
1ae8f5a303
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-11-26 13:31:37 -08:00
0df0c98a70
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-11-26 13:31:34 -08:00
ee1b66545a
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-11-26 13:31:22 -08:00
a428fedd3a
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-11-26 13:31:16 -08:00
d4e940f3e2
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2008-11-26 13:31:09 -08:00
989cbbfe5b
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2008-11-26 13:31:06 -08:00
4c11cdbfe4
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2008-11-26 13:31:04 -08:00
23cd5ea273
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-11-26 13:31:03 -08:00
ece1bcb3ef
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 13:31:01 -08:00
25197947b8
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2008-11-26 13:30:58 -08:00
5c75fe725c
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-11-26 13:30:57 -08:00
498dd20132
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2008-11-26 13:30:55 -08:00
36c2ea3c9c
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-11-26 13:30:54 -08:00
d7dc1da01a
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-11-26 13:30:52 -08:00
432daf67b3
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 13:30:51 -08:00
fe0b727e3f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 13:30:45 -08:00
cb4b777946
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 13:30:44 -08:00
dbceaca71d
Prefix META_ALIAS with ZFS_
2008-11-26 13:28:44 -08:00
ec058a1f5d
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-11-26 13:14:54 -08:00
533dc9787a
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-11-26 13:14:48 -08:00
4183097731
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-11-26 13:14:44 -08:00
8ccaee0f9e
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-11-26 13:14:32 -08:00
3b3d4383d4
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2008-11-26 13:14:26 -08:00
cced2f15c0
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2008-11-26 13:14:20 -08:00
0ebce9f371
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2008-11-26 13:14:16 -08:00
b2f7352587
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2008-11-26 13:14:15 -08:00
bb43036568
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-11-26 13:14:13 -08:00
5ea9df34f0
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 13:14:12 -08:00
46d4d4d483
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2008-11-26 13:14:09 -08:00
d9023c98ce
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-11-26 13:14:07 -08:00
489ec56ed6
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2008-11-26 13:14:05 -08:00
c4e5f68cf2
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-11-26 13:14:03 -08:00
5e125debbe
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-11-26 13:14:02 -08:00
4574b7a27a
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 13:14:00 -08:00
ea1b9dc3f3
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 13:13:53 -08:00
8046a29565
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 13:13:52 -08:00
cb9c044bf6
Add SPL prefix to META_* #defines
2008-11-26 13:11:33 -08:00
6299b56dc3
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2008-11-26 12:56:54 -08:00
5b9ea94733
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-11-26 12:56:48 -08:00
9a9f14e5b4
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-11-26 12:56:45 -08:00
Brian Behlendorf