Brian Behlendorf
|
12ed77ee86
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2009-11-15 16:26:44 -08:00 |
|
Brian Behlendorf
|
756ced6a4e
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2009-11-15 16:26:44 -08:00 |
|
Brian Behlendorf
|
df9f0836db
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2009-11-15 16:26:43 -08:00 |
|
Brian Behlendorf
|
08b581e77b
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2009-11-15 16:26:43 -08:00 |
|
Brian Behlendorf
|
e663d428a4
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2009-11-15 16:26:42 -08:00 |
|
Brian Behlendorf
|
437a6a6f61
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2009-11-15 16:26:42 -08:00 |
|
Brian Behlendorf
|
3206618a84
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2009-11-15 16:26:41 -08:00 |
|
Brian Behlendorf
|
584ad2b364
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2009-11-15 16:26:40 -08:00 |
|
Brian Behlendorf
|
dc5f610e90
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2009-11-15 16:26:40 -08:00 |
|
Brian Behlendorf
|
8d0c0b0782
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2009-11-15 16:26:39 -08:00 |
|
Brian Behlendorf
|
b3c507f429
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2009-11-15 16:26:38 -08:00 |
|
Brian Behlendorf
|
0b57c83685
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2009-11-15 16:26:38 -08:00 |
|
Brian Behlendorf
|
dcd4d95764
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2009-11-15 16:26:37 -08:00 |
|
Brian Behlendorf
|
d5933419e0
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2009-11-15 16:26:37 -08:00 |
|
Brian Behlendorf
|
00f3dfb5e9
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-11-15 16:26:36 -08:00 |
|
Brian Behlendorf
|
e57bf40c98
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2009-11-15 16:26:36 -08:00 |
|
Brian Behlendorf
|
59cbe87375
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-11-15 16:26:31 -08:00 |
|
Brian Behlendorf
|
51bc0df445
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-11-15 16:26:30 -08:00 |
|
Brian Behlendorf
|
2bee739b4c
|
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:30 -08:00 |
|
Brian Behlendorf
|
13309c929d
|
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
|
2009-11-15 16:26:29 -08:00 |
|
Brian Behlendorf
|
4ef70c783d
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:27 -08:00 |
|
Brian Behlendorf
|
ed1f75364a
|
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
|
2009-11-15 16:26:26 -08:00 |
|
Brian Behlendorf
|
d80d6e9bc0
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:24 -08:00 |
|
Brian Behlendorf
|
123728d9ae
|
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
|
2009-11-15 16:26:23 -08:00 |
|
Brian Behlendorf
|
bb4fcdc504
|
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:21 -08:00 |
|
Brian Behlendorf
|
4f9acff2d8
|
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
|
2009-11-15 16:26:20 -08:00 |
|
Brian Behlendorf
|
7de12fa47e
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:19 -08:00 |
|
Brian Behlendorf
|
b5e7e8a1de
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
|
2009-11-15 16:26:17 -08:00 |
|
Brian Behlendorf
|
c79a602d88
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:16 -08:00 |
|
Brian Behlendorf
|
26844cb8e1
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2009-11-15 16:26:14 -08:00 |
|
Brian Behlendorf
|
9bb3ec458b
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:13 -08:00 |
|
Brian Behlendorf
|
217998d1a3
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2009-11-15 16:26:12 -08:00 |
|
Brian Behlendorf
|
0ba18e9310
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:09 -08:00 |
|
Brian Behlendorf
|
ecdec2a90d
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-11-15 16:26:08 -08:00 |
|
Brian Behlendorf
|
21e5a5ee85
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:06 -08:00 |
|
Brian Behlendorf
|
56d2a97b3b
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2009-11-15 16:26:05 -08:00 |
|
Brian Behlendorf
|
a1bac081ee
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:03 -08:00 |
|
Brian Behlendorf
|
109d34244d
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2009-11-15 16:26:02 -08:00 |
|
Brian Behlendorf
|
49468cacf3
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2009-11-15 16:26:00 -08:00 |
|
Brian Behlendorf
|
8338a080a8
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2009-11-15 16:25:59 -08:00 |
|
Brian Behlendorf
|
a26d57f6f7
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2009-11-15 16:25:57 -08:00 |
|
Brian Behlendorf
|
86737ffc6c
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2009-11-15 16:25:56 -08:00 |
|
Brian Behlendorf
|
c2b8421841
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-11-15 16:25:55 -08:00 |
|
Brian Behlendorf
|
9d03c28169
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-11-15 16:25:53 -08:00 |
|
Brian Behlendorf
|
d8aef5d7bc
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-11-15 16:25:52 -08:00 |
|
Brian Behlendorf
|
030d49c262
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-11-15 16:25:50 -08:00 |
|
Brian Behlendorf
|
0aa61e8427
|
Remove zvol.c when updating in update-zfs.sh Linux version available.
|
2009-11-15 16:20:01 -08:00 |
|
Brian Behlendorf
|
cb1d685dd1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-11-12 12:56:17 -08:00 |
|
Brian Behlendorf
|
9ee04032de
|
Linux 2.6.31 logical block size compatibility.
Autoconf check for bdev_logical_block_size() helper which replaced
bdev_hardsect_size() as the correct way to get the sector size.
|
2009-11-12 12:49:01 -08:00 |
|
Brian Behlendorf
|
3d023d9a2e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-11-02 15:10:29 -08:00 |