Brian Behlendorf
|
86e39f5e3b
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:05:21 -08:00 |
|
Brian Behlendorf
|
a54285e83e
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2009-01-15 14:04:46 -08:00 |
|
Brian Behlendorf
|
4adbf673d2
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2009-01-15 14:04:45 -08:00 |
|
Brian Behlendorf
|
8aa8457e3e
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2009-01-15 14:04:43 -08:00 |
|
Brian Behlendorf
|
0f68134272
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2009-01-15 14:04:42 -08:00 |
|
Brian Behlendorf
|
9140c1af89
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-15 14:04:40 -08:00 |
|
Brian Behlendorf
|
a2e601c6e3
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-01-15 14:04:39 -08:00 |
|
Brian Behlendorf
|
3fa768e21b
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:04:35 -08:00 |
|
Brian Behlendorf
|
d3df6b2012
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-15 14:01:51 -08:00 |
|
Brian Behlendorf
|
fb5f0bc833
|
Rebase master to b105
|
2009-01-15 13:59:39 -08:00 |
|
Brian Behlendorf
|
407bc94813
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-15 10:17:41 -08:00 |
|
Brian Behlendorf
|
6932f09bb5
|
Reference module not modules in SPL for consistency
|
2009-01-15 10:14:21 -08:00 |
|
Brian Behlendorf
|
3a4c074fca
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-14 15:44:11 -08:00 |
|
Brian Behlendorf
|
9c22d76019
|
Minor 'make check' updates
|
2009-01-14 15:38:56 -08:00 |
|
Brian Behlendorf
|
db2890df46
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-14 13:46:37 -08:00 |
|
Brian Behlendorf
|
095c83db71
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-14 13:45:31 -08:00 |
|
Brian Behlendorf
|
1c54d0d15d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-14 13:45:31 -08:00 |
|
Brian Behlendorf
|
d1e802ec14
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-14 13:45:30 -08:00 |
|
Brian Behlendorf
|
a7e8d5a15a
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-14 13:45:30 -08:00 |
|
Brian Behlendorf
|
d443f1ae05
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-14 13:45:28 -08:00 |
|
Brian Behlendorf
|
99d075d922
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-14 13:45:28 -08:00 |
|
Brian Behlendorf
|
06b00a5951
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-01-14 13:45:27 -08:00 |
|
Brian Behlendorf
|
3e7127371a
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-01-14 13:45:27 -08:00 |
|
Brian Behlendorf
|
f2c3f362c1
|
Update topmsg
|
2009-01-14 13:42:08 -08:00 |
|
Brian Behlendorf
|
57f204f6fd
|
Update topmsg
|
2009-01-14 13:41:56 -08:00 |
|
Brian Behlendorf
|
95576ca7a8
|
Update topmsg
|
2009-01-14 13:41:28 -08:00 |
|
Brian Behlendorf
|
fd3adc8f0a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 16:08:43 -08:00 |
|
Brian Behlendorf
|
04d7ae5f22
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 16:06:28 -08:00 |
|
Brian Behlendorf
|
c186f81c6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 16:06:26 -08:00 |
|
Brian Behlendorf
|
fe0f26150a
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 16:06:24 -08:00 |
|
Brian Behlendorf
|
e1632568f1
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 16:06:23 -08:00 |
|
Brian Behlendorf
|
be0b4029db
|
Initialize list links
|
2009-01-13 16:02:19 -08:00 |
|
Brian Behlendorf
|
b0064d448c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 15:35:06 -08:00 |
|
Brian Behlendorf
|
32baeb1712
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
0d6b81fcca
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:34:00 -08:00 |
|
Brian Behlendorf
|
3f5fdfbf8b
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
43cd437415
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
94944fab96
|
Fix proper list node initialization
|
2009-01-13 15:31:58 -08:00 |
|
Brian Behlendorf
|
4ea3a09fde
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 15:08:12 -08:00 |
|
Brian Behlendorf
|
b14513e826
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:07:08 -08:00 |
|
Brian Behlendorf
|
4c31283afc
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:07:07 -08:00 |
|
Brian Behlendorf
|
cad99cbd51
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 15:07:06 -08:00 |
|
Brian Behlendorf
|
2e9cd667d0
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-01-13 15:07:06 -08:00 |
|
Brian Behlendorf
|
fcd2296399
|
Additional rw_lock not being initialized cleaned in updated code
|
2009-01-13 15:05:02 -08:00 |
|
Brian Behlendorf
|
0231d2bb13
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 15:03:17 -08:00 |
|
Brian Behlendorf
|
60f5ac8ac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:02:12 -08:00 |
|
Brian Behlendorf
|
4a5bd7a3a8
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:02:11 -08:00 |
|
Brian Behlendorf
|
02821c5819
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 15:02:10 -08:00 |
|
Brian Behlendorf
|
6c96fc31e9
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:02:10 -08:00 |
|
Brian Behlendorf
|
bec036636e
|
List cleanup and use of list_node_init initializer
|
2009-01-13 15:00:12 -08:00 |