46481bc85e
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-03-09 14:19:30 -08:00
94053b9a3d
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-03-09 14:19:29 -08:00
4b7bc4e96d
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-03-09 14:19:28 -08:00
ed83735903
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-03-09 14:19:26 -08:00
fd94e31370
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-03-09 14:19:26 -08:00
490f689b9c
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-03-09 14:19:24 -08:00
d0ef2f8337
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-03-09 14:19:23 -08:00
4a7b8629d5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-03-09 14:19:21 -08:00
dcd0eecf89
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-03-09 14:19:20 -08:00
68e3c94270
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-03-09 14:19:18 -08:00
bbdcc9ac52
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-03-09 14:19:17 -08:00
8310167805
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-03-09 14:19:16 -08:00
8e2b8a52f7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-03-09 14:19:15 -08:00
9fc9e880ab
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-03-09 14:19:13 -08:00
cc3e0e6b01
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-03-09 14:19:12 -08:00
ed15654feb
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-03-09 14:19:10 -08:00
f3025c3875
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-03-09 14:19:09 -08:00
45b2e45354
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-03-09 14:19:07 -08:00
01dae884bc
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-03-09 14:19:06 -08:00
9d8767dfb2
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-03-09 14:19:04 -08:00
4d306e2583
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-03-09 14:19:03 -08:00
c09ab40097
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-03-09 14:19:02 -08:00
bd81c6a5d0
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-03-09 14:19:00 -08:00
d01019d8a3
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-03-09 14:18:58 -08:00
ddf8afb06b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-03-09 14:18:57 -08:00
49ea943914
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-03-09 14:18:56 -08:00
c60984f102
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-03-09 14:18:54 -08:00
774f7c02b1
Ignore unsigned module build products
...
Along with the addition of signed kernel modules in newer kernel
we have a few new build products we need to ignore. LKLM has the
whole thread for those interested: http://lkml.org/lkml/2007/2/14/164
2010-03-09 14:14:09 -08:00
9fa502c50b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 13:24:29 -08:00
e218fd13e8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 13:24:28 -08:00
ef359aee66
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 13:24:27 -08:00
f2ab1fea36
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 13:24:27 -08:00
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
48e74ed68b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
9a3d5378c6
Clean up emulation of kernel threads in userspace.
...
Updated to use pthread thread specific data rather than keeping
a global list. This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
710e779a08
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-01-08 11:39:30 -08:00
efd53d2969
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-01-08 11:39:30 -08:00
75bc637b6d
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:30 -08:00
b991553702
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-01-08 11:39:30 -08:00
a240c39095
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-01-08 11:39:29 -08:00
ee3aa7773b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-01-08 11:39:28 -08:00
eaf2e3231c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-01-08 11:39:28 -08:00
27ae099e65
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-01-08 11:39:27 -08:00
d285c096c9
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-01-08 11:39:27 -08:00
cad00c2fc1
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:27 -08:00
da35bd5b60
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-01-08 11:39:26 -08:00
050c1617d8
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-01-08 11:39:26 -08:00
3d5d35b616
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-01-08 11:39:26 -08:00
34c0ae76d9
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-01-08 11:39:25 -08:00
fe9ad9171a
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-01-08 11:39:25 -08:00
Brian Behlendorf
Ricardo M. Correia