Commit Graph

3634 Commits

Author SHA1 Message Date
Brian Behlendorf b45c6064bb Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source 2010-01-08 11:39:13 -08:00
Brian Behlendorf 44f298491f Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2010-01-08 11:39:13 -08:00
Brian Behlendorf ad95bcb285 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2010-01-08 11:39:12 -08:00
Brian Behlendorf 3b5ad392ae Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-01-08 11:39:12 -08:00
Brian Behlendorf e6f83f6a79 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-01-08 11:39:11 -08:00
Brian Behlendorf 9b94c126e5 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-01-08 11:39:11 -08:00
Brian Behlendorf 23a265cc7c Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2010-01-08 11:39:10 -08:00
Brian Behlendorf fab76164fa Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2010-01-08 11:39:10 -08:00
Brian Behlendorf cdbe3032eb Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-01-08 11:39:09 -08:00
Brian Behlendorf 1fb4391beb Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2010-01-08 11:39:09 -08:00
Brian Behlendorf adb3a3deec Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-01-08 11:39:08 -08:00
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 fd2aaf565a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-01-08 10:26:13 -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 d4f8dda545 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-12-23 14:51:15 -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 10799d975e Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-12-18 14:32:17 -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 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 36f04a1dd4 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-12-11 16:53:19 -08:00
Brian Behlendorf 0cf0b27968 Add man pages to the build system and packages. 2009-12-11 16:49:25 -08:00
Brian Behlendorf 6e6114b7b8 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-12-11 16:23:29 -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