Brian Behlendorf
|
574b2c897e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:29:58 -08:00 |
|
Brian Behlendorf
|
372dba924d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:29:58 -08:00 |
|
Brian Behlendorf
|
ab52989424
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:29:50 -08:00 |
|
Brian Behlendorf
|
cb55f9a832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:29:11 -08:00 |
|
Brian Behlendorf
|
43b4c537eb
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:29:10 -08:00 |
|
Brian Behlendorf
|
71f5320a32
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-15 14:29:09 -08:00 |
|
Brian Behlendorf
|
f969333c73
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 14:29:09 -08:00 |
|
Brian Behlendorf
|
c4fc002c87
|
Resolve C90 int declared in for() construct
|
2009-01-15 14:26:52 -08:00 |
|
Brian Behlendorf
|
924bc262cc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:21:05 -08:00 |
|
Brian Behlendorf
|
ee1faab64d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:21:03 -08:00 |
|
Brian Behlendorf
|
091a4a4ca4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:20:49 -08:00 |
|
Brian Behlendorf
|
ddaad20220
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:16:23 -08:00 |
|
Brian Behlendorf
|
12a1def575
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:16:22 -08:00 |
|
Brian Behlendorf
|
1d35507203
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-01-15 14:16:21 -08:00 |
|
Brian Behlendorf
|
a6f5fb35f6
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2009-01-15 14:16:20 -08:00 |
|
Brian Behlendorf
|
27cf20b0d6
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-01-15 14:16:19 -08:00 |
|
Brian Behlendorf
|
25a5d8f63c
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:16:16 -08:00 |
|
Brian Behlendorf
|
334d11e994
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-15 14:16:16 -08:00 |
|
Brian Behlendorf
|
88ef90526c
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-15 14:16:15 -08:00 |
|
Brian Behlendorf
|
625451acfc
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2009-01-15 14:16:14 -08:00 |
|
Brian Behlendorf
|
fa34b5f8ed
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2009-01-15 14:16:12 -08:00 |
|
Brian Behlendorf
|
b5409ba1e2
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2009-01-15 14:16:12 -08:00 |
|
Brian Behlendorf
|
a253814eaf
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2009-01-15 14:16:10 -08:00 |
|
Brian Behlendorf
|
1d3ce40c2e
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-01-15 14:16:09 -08:00 |
|
Brian Behlendorf
|
09d8fd136b
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-01-15 14:16:07 -08:00 |
|
Brian Behlendorf
|
7c80f43566
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2009-01-15 14:16:06 -08:00 |
|
Brian Behlendorf
|
81d8053623
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2009-01-15 14:16:04 -08:00 |
|
Brian Behlendorf
|
a42707fcc0
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:16:03 -08:00 |
|
Brian Behlendorf
|
10280d0999
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2009-01-15 14:15:04 -08:00 |
|
Brian Behlendorf
|
3a8135e14c
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2009-01-15 14:15:04 -08:00 |
|
Brian Behlendorf
|
c1f89769dd
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2009-01-15 14:15:01 -08:00 |
|
Brian Behlendorf
|
a7486f9608
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2009-01-15 14:15:01 -08:00 |
|
Brian Behlendorf
|
520bbb108d
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2009-01-15 14:14:59 -08:00 |
|
Brian Behlendorf
|
089836c3e4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:14:57 -08:00 |
|
Brian Behlendorf
|
c6292c47a7
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2009-01-15 14:13:54 -08:00 |
|
Brian Behlendorf
|
48a55a0a10
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2009-01-15 14:13:54 -08:00 |
|
Brian Behlendorf
|
a69d02c405
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2009-01-15 14:13:52 -08:00 |
|
Brian Behlendorf
|
6d0be909c8
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2009-01-15 14:13:51 -08:00 |
|
Brian Behlendorf
|
6e3c742027
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2009-01-15 14:13:49 -08:00 |
|
Brian Behlendorf
|
a378243d07
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2009-01-15 14:13:49 -08:00 |
|
Brian Behlendorf
|
d558d8818e
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2009-01-15 14:13:47 -08:00 |
|
Brian Behlendorf
|
216ce72418
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2009-01-15 14:13:46 -08:00 |
|
Brian Behlendorf
|
973c927422
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2009-01-15 14:13:44 -08:00 |
|
Brian Behlendorf
|
2e35cc0802
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2009-01-15 14:13:43 -08:00 |
|
Brian Behlendorf
|
551838a6c8
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:13:39 -08:00 |
|
Brian Behlendorf
|
b633e4f669
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-01-15 14:11:26 -08:00 |
|
Brian Behlendorf
|
da7151a89e
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:11:19 -08:00 |
|
Brian Behlendorf
|
74dd94c807
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-15 14:05:40 -08:00 |
|
Brian Behlendorf
|
3646bbdd86
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2009-01-15 14:05:39 -08:00 |
|
Brian Behlendorf
|
7b54fe44dc
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
|
2009-01-15 14:05:38 -08:00 |