f70a3b3889
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-01-08 11:39:21 -08:00
1248d0da1a
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-01-08 11:39:21 -08:00
9b32e1cc61
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-01-08 11:39:20 -08:00
9aa7432a39
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-01-08 11:39:20 -08:00
39235e0172
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-01-08 11:39:20 -08:00
9002f847df
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-01-08 11:39:19 -08:00
94872fcdab
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-01-08 11:39:19 -08:00
c5a22252ab
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-01-08 11:39:19 -08:00
f2607bbb8f
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-01-08 11:39:18 -08:00
365c47de76
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-01-08 11:39:18 -08:00
93befe62be
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-01-08 11:39:17 -08:00
c3835d1483
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-01-08 11:39:17 -08:00
e02d36ad39
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-01-08 11:39:17 -08:00
c1d363770f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-01-08 11:39:16 -08:00
68fc990a4b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-01-08 11:39:16 -08:00
8513efcadd
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-01-08 11:39:16 -08:00
6cb71e1dec
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:14 -08:00
cbc1c11cf5
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-01-08 11:39:13 -08:00
44f298491f
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-01-08 11:39:13 -08:00
b45c6064bb
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-01-08 11:39:13 -08:00
3b5ad392ae
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-01-08 11:39:12 -08:00
ad95bcb285
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-01-08 11:39:12 -08:00
9b94c126e5
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-01-08 11:39:11 -08:00
e6f83f6a79
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-01-08 11:39:11 -08:00
fab76164fa
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-01-08 11:39:10 -08:00
23a265cc7c
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-01-08 11:39:10 -08:00
1fb4391beb
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-01-08 11:39:09 -08:00
cdbe3032eb
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-01-08 11:39:09 -08:00
b3cd169cfd
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-01-08 11:39:08 -08:00
adb3a3deec
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-01-08 11:39:08 -08:00
92c83d3aed
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-01-08 11:39:07 -08:00
519a66c6ef
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-01-08 11:39:07 -08:00
8af10063d6
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-01-08 11:39:06 -08:00
d48b3a8869
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-01-08 11:39:06 -08:00
c4b106a02f
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-01-08 11:39:05 -08:00
19982171a8
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-01-08 11:39:05 -08:00
c1a2bb2a85
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-01-08 11:39:04 -08:00
aeb5db5cbc
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-01-08 11:39:04 -08:00
94615764b1
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-01-08 11:39:03 -08:00
7c9e7a95e4
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-01-08 11:39:03 -08:00
3dff9afe42
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-01-08 11:39:02 -08:00
bf6f205d7f
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-01-08 11:39:02 -08:00
62cf23a9cf
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-01-08 11:39:01 -08:00
8d4f979e7f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-01-08 11:39:01 -08:00
e69572c1b5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-01-08 11:39:00 -08:00
69804965e9
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-01-08 11:39:00 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
00d3906dda
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-01-08 10:25:49 -08:00
e0aff96a14
Use udevadm if available otherwise use udevtrigger/udevsettle
...
Moving forward udevadm {trigger/settle} replaced udevtrigger/udevsettle
as the correct interface to use. However, since we need to work in
both environments for testing check and see if udevadm is available.
If it is then use it. If it is not fall back to the legacy interface.
2010-01-08 10:20:03 -08:00
1d8caaf84d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-12-23 14:50:21 -08:00
Brian Behlendorf