Brian Behlendorf
|
5ff9346b83
|
Merge commit 'refs/top-bases/fix-zio-thread-names' into fix-zio-thread-names
|
2008-11-24 11:30:25 -08:00 |
|
Brian Behlendorf
|
60eb150eda
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-11-24 11:30:24 -08:00 |
|
Brian Behlendorf
|
d5be38e08b
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-11-24 11:30:24 -08:00 |
|
Brian Behlendorf
|
f36cd0158a
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2008-11-24 11:30:23 -08:00 |
|
Brian Behlendorf
|
a9f666c372
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-11-24 11:30:22 -08:00 |
|
Brian Behlendorf
|
0001759258
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-11-24 11:30:21 -08:00 |
|
Brian Behlendorf
|
9b9363121f
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2008-11-24 11:30:21 -08:00 |
|
Brian Behlendorf
|
ebaaeda511
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-11-24 11:30:20 -08:00 |
|
Brian Behlendorf
|
6b9d38d608
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2008-11-24 11:30:20 -08:00 |
|
Brian Behlendorf
|
d36fd101f6
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2008-11-24 11:30:19 -08:00 |
|
Brian Behlendorf
|
b02baaaeb9
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2008-11-24 11:30:18 -08:00 |
|
Brian Behlendorf
|
1552a30d6f
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-11-24 11:30:17 -08:00 |
|
Brian Behlendorf
|
aa1d144111
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2008-11-24 11:30:17 -08:00 |
|
Brian Behlendorf
|
f13b51fe60
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-11-24 11:30:16 -08:00 |
|
Brian Behlendorf
|
ebefa1d4c1
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2008-11-24 11:30:16 -08:00 |
|
Brian Behlendorf
|
92caa4daad
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-11-24 11:30:15 -08:00 |
|
Brian Behlendorf
|
fe41dd9976
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2008-11-24 11:30:15 -08:00 |
|
Brian Behlendorf
|
57b5ad97fb
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-11-24 11:30:13 -08:00 |
|
Brian Behlendorf
|
a1a4d8c4a8
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2008-11-24 11:30:13 -08:00 |
|
Brian Behlendorf
|
ebb930a730
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-11-24 11:30:12 -08:00 |
|
Brian Behlendorf
|
1aed30e653
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2008-11-24 11:30:12 -08:00 |
|
Brian Behlendorf
|
2060f094f9
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-11-24 11:30:11 -08:00 |
|
Brian Behlendorf
|
533c717693
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-11-24 11:30:10 -08:00 |
|
Brian Behlendorf
|
1c4c6f6b75
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-11-24 11:30:08 -08:00 |
|
Brian Behlendorf
|
afae127ba0
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-11-24 11:30:07 -08:00 |
|
Brian Behlendorf
|
154c3a0096
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-11-24 11:30:06 -08:00 |
|
Brian Behlendorf
|
9a761928ad
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-11-24 11:30:06 -08:00 |
|
Brian Behlendorf
|
eb17c45385
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-11-24 11:30:05 -08:00 |
|
Brian Behlendorf
|
49385bd6ff
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-11-24 11:30:05 -08:00 |
|
Brian Behlendorf
|
22b47b5536
|
Use config directory, enable maintainer mode
|
2008-11-24 11:29:11 -08:00 |
|
Brian Behlendorf
|
a19e4daac9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-11-24 11:24:04 -08:00 |
|
Brian Behlendorf
|
16631cd67c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-11-24 11:23:59 -08:00 |
|
Brian Behlendorf
|
40ea44128f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-24 11:23:55 -08:00 |
|
Brian Behlendorf
|
eda937aa37
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-11-24 11:23:54 -08:00 |
|
Brian Behlendorf
|
836570cbd3
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-11-24 11:23:47 -08:00 |
|
Brian Behlendorf
|
b916c43c46
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-11-24 11:23:43 -08:00 |
|
Brian Behlendorf
|
81caa0606f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-11-24 11:23:38 -08:00 |
|
Brian Behlendorf
|
c2416f04d0
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-11-24 11:23:34 -08:00 |
|
Brian Behlendorf
|
6ce3e22024
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-11-24 11:23:30 -08:00 |
|
Brian Behlendorf
|
5fc48621b3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-11-24 11:23:26 -08:00 |
|
Brian Behlendorf
|
93ee312cce
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-11-24 11:23:21 -08:00 |
|
Brian Behlendorf
|
8e355dc9b9
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-11-24 11:23:13 -08:00 |
|
Brian Behlendorf
|
38152226e7
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-11-24 11:23:09 -08:00 |
|
Brian Behlendorf
|
25be393c42
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-11-24 11:23:04 -08:00 |
|
Brian Behlendorf
|
3b033caae6
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-11-24 11:23:00 -08:00 |
|
Brian Behlendorf
|
d28617cd53
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-11-24 11:22:51 -08:00 |
|
Brian Behlendorf
|
2327e1bea9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-11-24 11:22:46 -08:00 |
|
Brian Behlendorf
|
8f4954db2d
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-11-24 11:22:45 -08:00 |
|
Brian Behlendorf
|
9e8e499cea
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-11-24 11:22:45 -08:00 |
|
Brian Behlendorf
|
f693f0bfdf
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-11-24 11:22:44 -08:00 |
|