Brian Behlendorf
|
56ed73d6e0
|
Refresh linux-have-libdiskmgt
|
2008-12-05 10:26:25 -08:00 |
|
Brian Behlendorf
|
9baaa468ac
|
Refresh zfs-branch
|
2008-12-05 09:46:11 -08:00 |
|
Brian Behlendorf
|
b151bbbb44
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-05 09:36:28 -08:00 |
|
Brian Behlendorf
|
7a34cab76d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-05 09:36:20 -08:00 |
|
Brian Behlendorf
|
74e79d3bf6
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:36 -08:00 |
|
Brian Behlendorf
|
779061eb3f
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:28 -08:00 |
|
Brian Behlendorf
|
f87b4ddad7
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:21 -08:00 |
|
Brian Behlendorf
|
db27ad2a22
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:15 -08:00 |
|
Brian Behlendorf
|
82e0ed26f9
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:09 -08:00 |
|
Brian Behlendorf
|
3dce9c0ff7
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:03 -08:00 |
|
Brian Behlendorf
|
74fbfae8f4
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-05 09:33:58 -08:00 |
|
Brian Behlendorf
|
7e27dd328e
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-05 09:33:51 -08:00 |
|
Brian Behlendorf
|
152004c1eb
|
Refresh gcc-unused branch
|
2008-12-05 09:21:43 -08:00 |
|
Brian Behlendorf
|
3f7a975c8e
|
Refresh gcc-uninit branch
|
2008-12-05 09:13:58 -08:00 |
|
Brian Behlendorf
|
f38455a2e1
|
Refresh gcc-no-parenthesis branch
|
2008-12-05 09:09:02 -08:00 |
|
Brian Behlendorf
|
1caa5db385
|
Refresh
|
2008-12-04 15:05:54 -08:00 |
|
Brian Behlendorf
|
647580c8f1
|
Refresh gcc-invalid-prototype branch
|
2008-12-04 15:00:44 -08:00 |
|
Brian Behlendorf
|
96dd9f20c3
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-04 14:41:57 -08:00 |
|
Brian Behlendorf
|
d89462d075
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-04 14:41:26 -08:00 |
|
Brian Behlendorf
|
8de21aeeef
|
Refresh gcc-cast branch
|
2008-12-04 14:41:11 -08:00 |
|
Brian Behlendorf
|
b2b57f4a8a
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-03 16:59:30 -08:00 |
|
Brian Behlendorf
|
84b88863cb
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2008-12-03 16:56:53 -08:00 |
|
Brian Behlendorf
|
3934fa5796
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-03 16:56:44 -08:00 |
|
Brian Behlendorf
|
8b02fed645
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2008-12-03 16:56:35 -08:00 |
|
Brian Behlendorf
|
13c9056431
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-03 16:56:28 -08:00 |
|
Brian Behlendorf
|
509faf8d6e
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2008-12-03 16:56:22 -08:00 |
|
Brian Behlendorf
|
094c415cc7
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-03 16:56:21 -08:00 |
|
Brian Behlendorf
|
189f60fb23
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2008-12-03 16:56:10 -08:00 |
|
Brian Behlendorf
|
1d26394d2d
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-03 16:56:10 -08:00 |
|
Brian Behlendorf
|
25b568c651
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2008-12-03 16:56:01 -08:00 |
|
Brian Behlendorf
|
a01917a91d
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-03 16:56:00 -08:00 |
|
Brian Behlendorf
|
8f14acd0ba
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2008-12-03 16:55:50 -08:00 |
|
Brian Behlendorf
|
7ee15c26a4
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-03 16:55:49 -08:00 |
|
Brian Behlendorf
|
95bc12dae2
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2008-12-03 16:55:41 -08:00 |
|
Brian Behlendorf
|
edd4013797
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-03 16:55:41 -08:00 |
|
Brian Behlendorf
|
93353cff74
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2008-12-03 16:55:33 -08:00 |
|
Brian Behlendorf
|
6113c6468a
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-03 16:55:32 -08:00 |
|
Brian Behlendorf
|
45293dbdd2
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2008-12-03 16:55:23 -08:00 |
|
Brian Behlendorf
|
9a5374658d
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-03 16:55:22 -08:00 |
|
Brian Behlendorf
|
53b2172d24
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2008-12-03 16:55:12 -08:00 |
|
Brian Behlendorf
|
b39f8cfa48
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-03 16:55:11 -08:00 |
|
Brian Behlendorf
|
c48cf16fe6
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-03 16:47:10 -08:00 |
|
Brian Behlendorf
|
d04d66d1c7
|
Refreshed patch for newer upstream context
|
2008-12-03 16:28:35 -08:00 |
|
Brian Behlendorf
|
f3ee1c7591
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-03 16:19:11 -08:00 |
|
Brian Behlendorf
|
c05d222824
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-03 16:18:50 -08:00 |
|
Brian Behlendorf
|
7bc74ea3c7
|
Refreshed fix-pthreads based on upstream changes
|
2008-12-03 16:18:02 -08:00 |
|
Brian Behlendorf
|
0cf4e1006a
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-03 15:44:10 -08:00 |
|
Brian Behlendorf
|
4d579da99f
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-03 15:44:10 -08:00 |
|
Brian Behlendorf
|
96072c88e2
|
Add userspace zfs_context file
|
2008-12-03 15:43:56 -08:00 |
|
Brian Behlendorf
|
25a6bc4ffd
|
Update fix no zmod to handle context:
|
2008-12-03 13:31:00 -08:00 |
|
Brian Behlendorf
|
abfcf9e532
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-03 12:55:30 -08:00 |
|
Brian Behlendorf
|
b981a3ab4b
|
spa->spa_zio_cv dropped in upstream source, update fix-locks patch accordingly
|
2008-12-03 12:54:50 -08:00 |
|
Brian Behlendorf
|
3d58032e16
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-03 12:51:06 -08:00 |
|
Brian Behlendorf
|
e5db6312c8
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-03 12:50:46 -08:00 |
|
Brian Behlendorf
|
4ad630c929
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-03 12:50:24 -08:00 |
|
Brian Behlendorf
|
20e50e3a5e
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-03 12:50:02 -08:00 |
|
Brian Behlendorf
|
afe9e56ab0
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-03 12:49:26 -08:00 |
|
Brian Behlendorf
|
4acf46e211
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-03 12:48:42 -08:00 |
|
Brian Behlendorf
|
a0d3a74d7f
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-03 12:47:54 -08:00 |
|
Brian Behlendorf
|
97aace11b3
|
Refresh feature-commit-cb to handle new context
|
2008-12-03 12:38:46 -08:00 |
|
Brian Behlendorf
|
5f10755521
|
Refreshed feature-zap-cursor-to-key to handle new context
|
2008-12-03 12:25:47 -08:00 |
|
Brian Behlendorf
|
b128c09fbe
|
Rebase to OpenSolaris b103, in the process we are removing any code which did not originate from the OpenSolaris source. These changes will be reintroduced in topic branches for easier tracking
|
2008-12-03 12:09:06 -08:00 |
|
Brian Behlendorf
|
f0f8b2ccce
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-01 15:56:54 -08:00 |
|
Brian Behlendorf
|
bb6257d0fa
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-01 15:56:47 -08:00 |
|
Brian Behlendorf
|
3d325597ff
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-01 15:56:43 -08:00 |
|
Brian Behlendorf
|
2e8d0c4cd2
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-01 15:56:30 -08:00 |
|
Brian Behlendorf
|
2664929dc3
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-01 15:56:23 -08:00 |
|
Brian Behlendorf
|
63c49fa982
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-01 15:56:16 -08:00 |
|
Brian Behlendorf
|
4a805e2768
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-01 15:56:12 -08:00 |
|
Brian Behlendorf
|
9a90adb9bb
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-01 15:56:10 -08:00 |
|
Brian Behlendorf
|
95f9285e2f
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-01 15:56:08 -08:00 |
|
Brian Behlendorf
|
f65b548331
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-01 15:56:06 -08:00 |
|
Brian Behlendorf
|
68aef0aea9
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-01 15:56:02 -08:00 |
|
Brian Behlendorf
|
e8610745f3
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-01 15:55:59 -08:00 |
|
Brian Behlendorf
|
e24dd552fb
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-01 15:55:57 -08:00 |
|
Brian Behlendorf
|
551b8c5839
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-01 15:55:55 -08:00 |
|
Brian Behlendorf
|
3b5b736ba5
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-01 15:55:53 -08:00 |
|
Brian Behlendorf
|
24fca97809
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-01 15:55:50 -08:00 |
|
Brian Behlendorf
|
8b7791678f
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-01 15:55:44 -08:00 |
|
Brian Behlendorf
|
3179dae49d
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-01 15:55:42 -08:00 |
|
Brian Behlendorf
|
ef76e2f5ea
|
Removed build system from master branch, will relocate to linux-zfs-branch
|
2008-12-01 15:41:33 -08:00 |
|
Brian Behlendorf
|
fe441a9050
|
Relocate COPYING+COPYRIGHT, remove README cruft
|
2008-12-01 15:34:53 -08:00 |
|
Brian Behlendorf
|
578cd5b14f
|
Remove unused variable hash
|
2008-11-24 14:52:12 -08:00 |
|
Brian Behlendorf
|
572b26ddc3
|
Resolve 'suggest parentheses' warning which was introduced
|
2008-11-24 14:45:56 -08:00 |
|
Brian Behlendorf
|
4b67af72f4
|
Resolve C99 complience issue introduce by patch
|
2008-11-24 14:33:02 -08:00 |
|
Brian Behlendorf
|
4a0f5e9d5b
|
Add fix-no-zmod branch
|
2008-11-21 11:29:52 -08:00 |
|
Brian Behlendorf
|
0b80af1f8e
|
Add gcc-init-pragmas branch
|
2008-11-21 10:39:47 -08:00 |
|
Brian Behlendorf
|
b31c53455e
|
Add gcc-missing-case branch
|
2008-11-20 14:04:07 -08:00 |
|
Brian Behlendorf
|
9e5ad07ee1
|
Add gcc-c90 branch
|
2008-11-20 14:04:05 -08:00 |
|
Brian Behlendorf
|
22083501be
|
Add gcc-uninit branch
|
2008-11-20 14:04:00 -08:00 |
|
Brian Behlendorf
|
31e6119e47
|
Add gcc-debug branch
|
2008-11-20 14:03:57 -08:00 |
|
Brian Behlendorf
|
4d686ffef2
|
Add fix-stack branch
|
2008-11-20 12:52:12 -08:00 |
|
Brian Behlendorf
|
2878adedfd
|
Add fix-dsl_pool_t branch
|
2008-11-20 12:52:10 -08:00 |
|
Brian Behlendorf
|
4e9ae1370a
|
Add fix-dbuf_dirty_record_t branch
|
2008-11-20 12:52:09 -08:00 |
|
Brian Behlendorf
|
fdab741a77
|
Add fix-dnode-cons branch
|
2008-11-20 12:52:07 -08:00 |
|
Brian Behlendorf
|
0661fb127a
|
Add fix-newlines branch
|
2008-11-20 12:52:03 -08:00 |
|
Brian Behlendorf
|
f2eebd3377
|
Add fix-get-configs branch
|
2008-11-20 12:52:01 -08:00 |
|
Brian Behlendorf
|
53822a4c14
|
Add fix-evict-dbufs branch
|
2008-11-20 12:52:00 -08:00 |
|
Brian Behlendorf
|
8434aebf86
|
Add fix-rwlocks branch
|
2008-11-20 12:51:59 -08:00 |
|
Brian Behlendorf
|
46492187dd
|
Add fix-locks branch
|
2008-11-20 12:51:56 -08:00 |