Commit Graph

3267 Commits

Author SHA1 Message Date
Brian Behlendorf b662d33370 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-04-29 12:03:33 -07:00
Brian Behlendorf f90ac4206e Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2010-04-29 12:03:32 -07:00
Brian Behlendorf 5ef793a667 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-04-29 12:03:31 -07:00
Brian Behlendorf e366632a94 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2010-04-29 12:03:29 -07:00
Brian Behlendorf b1d3337507 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2010-04-29 12:03:27 -07:00
Brian Behlendorf 7571f9a6c1 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2010-04-29 12:03:26 -07:00
Brian Behlendorf 5afe7d53a2 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2010-04-29 12:03:25 -07:00
Brian Behlendorf 1ad1f4f5d6 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2010-04-29 12:03:23 -07:00
Brian Behlendorf cf77a0eba6 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2010-04-29 12:03:21 -07:00
Brian Behlendorf b3b5351af0 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2010-04-29 12:03:20 -07:00
Brian Behlendorf 8279f80885 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-04-29 12:03:18 -07:00
Brian Behlendorf c708851b13 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-04-29 12:03:17 -07:00
Brian Behlendorf 3affbe6d7e Update nvpair's to include nv_alloc_fixed support 2010-04-29 11:59:41 -07:00
Brian Behlendorf a534447ac5 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-04-29 11:02:40 -07:00
Brian Behlendorf c9ae4b9808 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 11:00:46 -07:00
Brian Behlendorf 8535236dca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 11:00:45 -07:00
Brian Behlendorf 8e48bbd18a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-04-29 11:00:44 -07:00
Brian Behlendorf 72de3a8ee1 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-04-29 11:00:44 -07:00
Brian Behlendorf 151f424dd8 Strip ident pragma from module/zfs/include/sys/fm/util.h 2010-04-29 10:57:17 -07:00
Brian Behlendorf 4d5d0f9ef5 Include FMA source and headers in build system 2010-04-29 10:55:27 -07:00
Brian Behlendorf c012a1c6b5 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-04-29 10:43:57 -07:00
Brian Behlendorf 1368594e11 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 10:41:59 -07:00
Brian Behlendorf a3eb10310d Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-04-29 10:41:58 -07:00
Brian Behlendorf d885028d41 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-04-29 10:41:57 -07:00
Brian Behlendorf ca4ad9f284 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-04-29 10:41:56 -07:00
Brian Behlendorf da940bba2b Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-04-29 10:41:56 -07:00
Brian Behlendorf 9199dc112a Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-04-29 10:41:55 -07:00
Brian Behlendorf c97d2c5541 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-04-29 10:41:53 -07:00
Brian Behlendorf 18f485a504 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-04-29 10:41:52 -07:00
Brian Behlendorf 7043465550 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-04-29 10:41:50 -07:00
Brian Behlendorf 4de8ce460a Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-04-29 10:41:49 -07:00
Brian Behlendorf b3eb04760f Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling 2010-04-29 10:41:48 -07:00
Brian Behlendorf 8474dcff2e Merge branch 'fix-error-handling' into refs/top-bases/fix-branch 2010-04-29 10:41:48 -07:00
Brian Behlendorf f2bb998991 Merge commit 'refs/top-bases/fix-acl' into fix-acl 2010-04-29 10:41:46 -07:00
Brian Behlendorf f79e622d33 Merge branch 'fix-acl' into refs/top-bases/fix-branch 2010-04-29 10:41:46 -07:00
Brian Behlendorf 791c30b9ad Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2010-04-29 10:41:45 -07:00
Brian Behlendorf 2bcbfccefe Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2010-04-29 10:41:44 -07:00
Brian Behlendorf 0044b18b16 Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 2010-04-29 10:41:43 -07:00
Brian Behlendorf 20666c2c7f Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2010-04-29 10:41:43 -07:00
Brian Behlendorf cab7510699 Merge commit 'refs/top-bases/fix-list' into fix-list 2010-04-29 10:41:41 -07:00
Brian Behlendorf 49a49fece6 Merge branch 'fix-list' into refs/top-bases/fix-branch 2010-04-29 10:41:41 -07:00
Brian Behlendorf 66af2279a0 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-04-29 10:41:40 -07:00
Brian Behlendorf 655b4b2b1c Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-04-29 10:41:39 -07:00
Brian Behlendorf 3e6811f827 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2010-04-29 10:41:38 -07:00
Brian Behlendorf 41ea78a5af Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-04-29 10:41:38 -07:00
Brian Behlendorf 52867336be Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2010-04-29 10:41:36 -07:00
Brian Behlendorf 929f9560b9 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2010-04-29 10:41:36 -07:00
Brian Behlendorf b435769a81 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2010-04-29 10:41:35 -07:00
Brian Behlendorf 6aeb39cbba Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2010-04-29 10:41:34 -07:00
Brian Behlendorf 8b60ca1d4a Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2010-04-29 10:41:33 -07:00