bf6f205d7f
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-01-08 11:39:02 -08:00
3dff9afe42
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-01-08 11:39:02 -08:00
8d4f979e7f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-01-08 11:39:01 -08:00
62cf23a9cf
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-01-08 11:39:01 -08:00
69804965e9
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-01-08 11:39:00 -08:00
e69572c1b5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-01-08 11:39:00 -08:00
c7ce25a94f
Add .gitignore files to exclude build products
2010-01-08 11:36:35 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
0e63df30fe
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-01-08 10:26:22 -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
31df8cd872
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-23 14:51:33 -08:00
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
cbafee6ff0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-18 14:32:29 -08:00
93b5403a64
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-12-18 14:31:22 -08:00
1a36b0ada1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-18 14:31:22 -08:00
f00925c9c0
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-12-18 14:31:21 -08:00
b58747a2e2
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-12-18 14:31:21 -08:00
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
65a9ad7d43
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-11 16:53:33 -08:00
0cf0b27968
Add man pages to the build system and packages.
2009-12-11 16:49:25 -08:00
4fdebcdb85
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-11 16:23:43 -08:00
77825f6f77
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-11 16:22:24 -08:00
9b6685297c
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-12-11 16:22:23 -08:00
bd452887b8
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-12-11 16:22:22 -08:00
381e48a2d8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-12-11 16:22:22 -08:00
6d7c81fc7a
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-12-11 16:22:22 -08:00
f2fd9d7728
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-12-11 16:22:21 -08:00
dc64c3498b
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-12-11 16:22:20 -08:00
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
453a9ae205
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-12-11 16:22:17 -08:00
769218cc9a
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-12-11 16:22:16 -08:00
73672e0b66
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2009-12-11 16:22:15 -08:00
ef72feceef
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-12-11 16:22:15 -08:00
39ea68ffcc
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-12-11 16:22:13 -08:00
9e22d4e163
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-12-11 16:22:13 -08:00
13ef957f1f
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-12-11 16:22:12 -08:00
3951938094
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-12-11 16:22:12 -08:00
da80b11b25
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-12-11 16:22:10 -08:00
5e2026bde3
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-12-11 16:22:10 -08:00
dd99f670b6
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-12-11 16:22:09 -08:00
d642b126ce
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-12-11 16:22:09 -08:00
83937eae80
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-12-11 16:22:07 -08:00
d77c0f7542
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-12-11 16:22:07 -08:00
aebea63638
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-12-11 16:22:06 -08:00
2a54bd469f
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-12-11 16:22:06 -08:00
0f3b4bdf2e
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-12-11 16:22:04 -08:00
2cabe87b34
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-12-11 16:22:04 -08:00
0a602e3ef2
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-12-11 16:22:02 -08:00
ef55dbb2c2
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-12-11 16:22:02 -08:00
13375d2e12
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-12-11 16:22:01 -08:00
Brian Behlendorf