Commit Graph

4053 Commits

Author SHA1 Message Date
Brian Behlendorf e7edc55fff Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 12:03:58 -07:00
Brian Behlendorf e8676d721c Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2010-04-29 12:03:57 -07:00
Brian Behlendorf bf805de0bf Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source 2010-04-29 12:03:56 -07:00
Brian Behlendorf a0020a75e7 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-04-29 12:03:54 -07:00
Brian Behlendorf 03bc0d94a2 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2010-04-29 12:03:53 -07:00
Brian Behlendorf 1d0cc73453 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-04-29 12:03:51 -07:00
Brian Behlendorf ff1883382e Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-04-29 12:03:50 -07:00
Brian Behlendorf 1345b417dc Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2010-04-29 12:03:48 -07:00
Brian Behlendorf a3cf723b21 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2010-04-29 12:03:47 -07:00
Brian Behlendorf 1683ed6067 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2010-04-29 12:03:46 -07:00
Brian Behlendorf 6edb312559 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-04-29 12:03:45 -07:00
Brian Behlendorf 1afd411e84 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-04-29 12:03:43 -07:00
Brian Behlendorf 3b12e5a66a Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-04-29 12:03:42 -07:00
Brian Behlendorf 6c762b4e15 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-04-29 12:03:40 -07:00
Brian Behlendorf 0ef388e9bb Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2010-04-29 12:03:39 -07:00
Brian Behlendorf f8959c6133 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-04-29 12:03:37 -07:00
Brian Behlendorf 75d373f38d Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2010-04-29 12:03:36 -07:00
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 e46d019df6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 11:01:31 -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 9c9f3480ad Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 10:42:47 -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