Brian Behlendorf
|
ec12bc1f02
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-05-27 13:51:48 -07:00 |
Brian Behlendorf
|
028e42b692
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-05-27 13:42:00 -07:00 |
Brian Behlendorf
|
d8e5eb56b8
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 13:42:00 -07:00 |
Brian Behlendorf
|
1dc4235011
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-27 13:40:14 -07:00 |
Brian Behlendorf
|
1e32b3c781
|
Revert feature-commit-cb feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
|
2010-05-27 13:39:17 -07:00 |
Brian Behlendorf
|
3bd93e7103
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-27 13:25:20 -07:00 |
Brian Behlendorf
|
099e8e493a
|
Remove feature-pthreads prior to b141 update.
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
|
2010-05-27 13:23:58 -07:00 |
Brian Behlendorf
|
75aeefed1d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-04-29 12:33:13 -07:00 |
Brian Behlendorf
|
98660aec20
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-04-29 12:32:01 -07:00 |
Brian Behlendorf
|
aa4a91aef5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-04-29 12:32:00 -07:00 |
Brian Behlendorf
|
354bebb795
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2010-04-29 12:31:59 -07:00 |
Brian Behlendorf
|
89154c98f9
|
Update build system to include nvpair_alloc_fixed.c.
|
2010-04-29 12:24:25 -07:00 |
Brian Behlendorf
|
f26fce7b17
|
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
|
2010-04-29 12:23:12 -07:00 |
Brian Behlendorf
|
4fdfc60d1d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-04-29 12:05:48 -07:00 |
Brian Behlendorf
|
66ba722b0a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-04-29 12:04:36 -07:00 |
Brian Behlendorf
|
f3017eccb7
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-04-29 12:04:33 -07:00 |
Brian Behlendorf
|
7a062682fb
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2010-04-29 12:04:32 -07:00 |
Brian Behlendorf
|
9c10b70375
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2010-04-29 12:04:31 -07:00 |
Brian Behlendorf
|
9d8e4f07ff
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2010-04-29 12:04:30 -07:00 |
Brian Behlendorf
|
e7edc55fff
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-04-29 12:03:58 -07:00 |
Brian Behlendorf
|
ff1883382e
|
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
|
2010-04-29 12:03:50 -07:00 |
Brian Behlendorf
|
8279f80885
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2010-04-29 12:03:18 -07:00 |
Brian Behlendorf
|
c708851b13
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2010-04-29 12:03:17 -07:00 |
Brian Behlendorf
|
3affbe6d7e
|
Update nvpair's to include nv_alloc_fixed support
|
2010-04-29 11:59:41 -07:00 |
Brian Behlendorf
|
8f872042d0
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-04-29 11:01:54 -07:00 |
Brian Behlendorf
|
c9ae4b9808
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-04-29 11:00:46 -07:00 |
Brian Behlendorf
|
8535236dca
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-04-29 11:00:45 -07:00 |
Brian Behlendorf
|
72de3a8ee1
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2010-04-29 11:00:44 -07:00 |
Brian Behlendorf
|
151f424dd8
|
Strip ident pragma from module/zfs/include/sys/fm/util.h
|
2010-04-29 10:57:17 -07:00 |
Brian Behlendorf
|
4d5d0f9ef5
|
Include FMA source and headers in build system
|
2010-04-29 10:55:27 -07:00 |
Brian Behlendorf
|
767de139ae
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-04-29 10:43:10 -07:00 |
Brian Behlendorf
|
1368594e11
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-04-29 10:41:59 -07:00 |
Brian Behlendorf
|
ca4ad9f284
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-04-29 10:41:56 -07:00 |
Brian Behlendorf
|
9199dc112a
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2010-04-29 10:41:55 -07:00 |
Brian Behlendorf
|
c97d2c5541
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2010-04-29 10:41:53 -07:00 |
Brian Behlendorf
|
18f485a504
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2010-04-29 10:41:52 -07:00 |
Brian Behlendorf
|
34d62da9bc
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-04-29 10:41:18 -07:00 |
Brian Behlendorf
|
d91c81c4df
|
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
|
2010-04-29 10:41:09 -07:00 |
Brian Behlendorf
|
8c24800b72
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2010-04-29 10:40:36 -07:00 |
Brian Behlendorf
|
4aad8d3244
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2010-04-29 10:40:34 -07:00 |
Brian Behlendorf
|
fa42225a3d
|
Add Solaris FMA style support
|
2010-04-29 10:37:15 -07:00 |
Brian Behlendorf
|
13d740f8fa
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-03-09 13:25:29 -08:00 |
Brian Behlendorf
|
19eef8ad39
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-03-09 13:24:30 -08:00 |
Brian Behlendorf
|
9fa502c50b
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-03-09 13:24:29 -08:00 |
Brian Behlendorf
|
e218fd13e8
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-03-09 13:24:28 -08:00 |
Brian Behlendorf
|
ef359aee66
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-03-09 13:24:27 -08:00 |
Brian Behlendorf
|
f2ab1fea36
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-03-09 13:24:27 -08:00 |
Ricardo M. Correia
|
2b85024275
|
Use CPU percentages for number of commit cb threads.
This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).
|
2010-03-09 13:21:20 -08:00 |
Brian Behlendorf
|
bd96142642
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-03-09 12:31:11 -08:00 |
Brian Behlendorf
|
8f63d438cd
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-03-09 12:30:18 -08:00 |