Brian Behlendorf
b3cd169cfd
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-01-08 11:39:08 -08:00
Brian Behlendorf
519a66c6ef
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-01-08 11:39:07 -08:00
Brian Behlendorf
92c83d3aed
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-01-08 11:39:07 -08:00
Brian Behlendorf
d48b3a8869
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-01-08 11:39:06 -08:00
Brian Behlendorf
8af10063d6
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-01-08 11:39:06 -08:00
Brian Behlendorf
19982171a8
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-01-08 11:39:05 -08:00
Brian Behlendorf
c4b106a02f
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-01-08 11:39:05 -08:00
Brian Behlendorf
aeb5db5cbc
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-01-08 11:39:04 -08:00
Brian Behlendorf
c1a2bb2a85
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-01-08 11:39:04 -08:00
Brian Behlendorf
7c9e7a95e4
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-01-08 11:39:03 -08:00
Brian Behlendorf
94615764b1
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-01-08 11:39:03 -08:00
Brian Behlendorf
bf6f205d7f
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-01-08 11:39:02 -08:00
Brian Behlendorf
3dff9afe42
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-01-08 11:39:02 -08:00
Brian Behlendorf
8d4f979e7f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-01-08 11:39:01 -08:00
Brian Behlendorf
62cf23a9cf
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-01-08 11:39:01 -08:00
Brian Behlendorf
69804965e9
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-01-08 11:39:00 -08:00
Brian Behlendorf
e69572c1b5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-01-08 11:39:00 -08:00
Brian Behlendorf
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
Brian Behlendorf
fc33bec8d2
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-01-08 10:25:36 -08:00
Brian Behlendorf
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
Brian Behlendorf
999cd320f9
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-12-23 14:49:54 -08:00
Brian Behlendorf
c824f39f95
Add a check for the fmode_t type.
...
This typedef first appears in 2.6.28 kernels as part of some
block device operation reworking.
2009-12-23 14:42:32 -08:00
Brian Behlendorf
93b5403a64
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-12-18 14:31:22 -08:00
Brian Behlendorf
e8ca8faa51
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-12-18 14:31:22 -08:00
Brian Behlendorf
1a36b0ada1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-18 14:31:22 -08:00
Brian Behlendorf
f00925c9c0
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-12-18 14:31:21 -08:00
Brian Behlendorf
b58747a2e2
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-12-18 14:31:21 -08:00
Brian Behlendorf
70ddc1393f
No inline to keep dmu_recv_stream() stack frame less than 1024 bytes.
...
Recent builds against 2.6.31 flagged dmu_recv_stream() as stack heavy.
As a quick simple way to resolve this I'm preventing the inlining of
certain functions which gcc will inline here because this is the only
place they are called. Futher analysis of this function should be
performed to futher reduce its stack usage.
2009-12-18 14:22:02 -08:00
Brian Behlendorf
7f36e17c7b
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-12-11 16:52:17 -08:00
Brian Behlendorf
0cf0b27968
Add man pages to the build system and packages.
2009-12-11 16:49:25 -08:00
Brian Behlendorf
455a6dafa4
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-12-11 16:22:25 -08:00
Brian Behlendorf
77825f6f77
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-11 16:22:24 -08:00
Brian Behlendorf
9b6685297c
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-12-11 16:22:23 -08:00
Brian Behlendorf
bd452887b8
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-12-11 16:22:22 -08:00
Brian Behlendorf
381e48a2d8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-12-11 16:22:22 -08:00
Brian Behlendorf
6d7c81fc7a
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-12-11 16:22:22 -08:00
Brian Behlendorf
f2fd9d7728
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-12-11 16:22:21 -08:00
Brian Behlendorf
dc64c3498b
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-12-11 16:22:20 -08:00
Brian Behlendorf
4a2898bfa0
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-12-11 16:22:19 -08:00
Brian Behlendorf
453a9ae205
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-12-11 16:22:17 -08:00
Brian Behlendorf
769218cc9a
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-12-11 16:22:16 -08:00
Brian Behlendorf
73672e0b66
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2009-12-11 16:22:15 -08:00
Brian Behlendorf
ef72feceef
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-12-11 16:22:15 -08:00
Brian Behlendorf
39ea68ffcc
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-12-11 16:22:13 -08:00
Brian Behlendorf
9e22d4e163
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-12-11 16:22:13 -08:00
Brian Behlendorf
13ef957f1f
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-12-11 16:22:12 -08:00
Brian Behlendorf
3951938094
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-12-11 16:22:12 -08:00
Brian Behlendorf
da80b11b25
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-12-11 16:22:10 -08:00
Brian Behlendorf
5e2026bde3
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-12-11 16:22:10 -08:00
Brian Behlendorf
dd99f670b6
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-12-11 16:22:09 -08:00