]>
granicus.if.org Git - zfs/log
Brian Behlendorf [Fri, 28 May 2010 19:44:01 +0000 (12:44 -0700)]
Remove gcc-shadow from gcc-branch
Brian Behlendorf [Fri, 28 May 2010 19:42:30 +0000 (12:42 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Fri, 28 May 2010 19:42:27 +0000 (12:42 -0700)]
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Conflicts:
lib/libzfs/libzfs_util.c
Brian Behlendorf [Fri, 28 May 2010 19:34:45 +0000 (12:34 -0700)]
Revert gcc-shadow using -Wno-shadow I can live with
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts. Anyway, this ends up being
more simply gratutous change than I care for.
Brian Behlendorf [Tue, 18 May 2010 22:00:39 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:38 +0000 (15:00 -0700)]
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:37 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Brian Behlendorf [Tue, 18 May 2010 22:00:35 +0000 (15:00 -0700)]
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:34 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Brian Behlendorf [Tue, 18 May 2010 22:00:32 +0000 (15:00 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:32 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Brian Behlendorf [Tue, 18 May 2010 22:00:30 +0000 (15:00 -0700)]
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:28 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
Brian Behlendorf [Tue, 18 May 2010 22:00:27 +0000 (15:00 -0700)]
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:25 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Brian Behlendorf [Tue, 18 May 2010 22:00:24 +0000 (15:00 -0700)]
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:23 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
Brian Behlendorf [Tue, 18 May 2010 22:00:21 +0000 (15:00 -0700)]
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:20 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Brian Behlendorf [Tue, 18 May 2010 22:00:18 +0000 (15:00 -0700)]
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:17 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
Brian Behlendorf [Tue, 18 May 2010 22:00:15 +0000 (15:00 -0700)]
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:13 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
Brian Behlendorf [Tue, 18 May 2010 22:00:12 +0000 (15:00 -0700)]
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:10 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
Brian Behlendorf [Tue, 18 May 2010 22:00:09 +0000 (15:00 -0700)]
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:08 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
Brian Behlendorf [Tue, 18 May 2010 22:00:06 +0000 (15:00 -0700)]
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:04 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
Brian Behlendorf [Tue, 18 May 2010 22:00:02 +0000 (15:00 -0700)]
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 22:00:00 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Brian Behlendorf [Tue, 18 May 2010 21:59:58 +0000 (14:59 -0700)]
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:59:57 +0000 (14:59 -0700)]
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Brian Behlendorf [Tue, 18 May 2010 21:55:01 +0000 (14:55 -0700)]
Add AUTHORS to master branch
Brian Behlendorf [Tue, 18 May 2010 21:33:07 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:07 +0000 (14:33 -0700)]
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:06 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Brian Behlendorf [Tue, 18 May 2010 21:33:04 +0000 (14:33 -0700)]
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:03 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Brian Behlendorf [Tue, 18 May 2010 21:33:01 +0000 (14:33 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:33:00 +0000 (14:33 -0700)]
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Brian Behlendorf [Tue, 18 May 2010 21:32:58 +0000 (14:32 -0700)]
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:57 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
Brian Behlendorf [Tue, 18 May 2010 21:32:55 +0000 (14:32 -0700)]
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:54 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Brian Behlendorf [Tue, 18 May 2010 21:32:52 +0000 (14:32 -0700)]
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:51 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
Brian Behlendorf [Tue, 18 May 2010 21:32:49 +0000 (14:32 -0700)]
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:48 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Brian Behlendorf [Tue, 18 May 2010 21:32:46 +0000 (14:32 -0700)]
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:45 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
Brian Behlendorf [Tue, 18 May 2010 21:32:43 +0000 (14:32 -0700)]
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:41 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
Brian Behlendorf [Tue, 18 May 2010 21:32:39 +0000 (14:32 -0700)]
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:38 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
Brian Behlendorf [Tue, 18 May 2010 21:32:37 +0000 (14:32 -0700)]
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:35 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
Brian Behlendorf [Tue, 18 May 2010 21:32:34 +0000 (14:32 -0700)]
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:32 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
Brian Behlendorf [Tue, 18 May 2010 21:32:30 +0000 (14:32 -0700)]
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:28 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Brian Behlendorf [Tue, 18 May 2010 21:32:27 +0000 (14:32 -0700)]
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 21:32:25 +0000 (14:32 -0700)]
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Brian Behlendorf [Tue, 18 May 2010 21:25:28 +0000 (14:25 -0700)]
Update COPYRIGHT to reference zpios CDDL exceptions.
Brian Behlendorf [Tue, 18 May 2010 18:13:31 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:31 +0000 (11:13 -0700)]
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:30 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Brian Behlendorf [Tue, 18 May 2010 18:13:28 +0000 (11:13 -0700)]
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:27 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Brian Behlendorf [Tue, 18 May 2010 18:13:25 +0000 (11:13 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:24 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Brian Behlendorf [Tue, 18 May 2010 18:13:22 +0000 (11:13 -0700)]
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:21 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
Brian Behlendorf [Tue, 18 May 2010 18:13:19 +0000 (11:13 -0700)]
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:18 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Brian Behlendorf [Tue, 18 May 2010 18:13:16 +0000 (11:13 -0700)]
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:15 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
Brian Behlendorf [Tue, 18 May 2010 18:13:13 +0000 (11:13 -0700)]
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:12 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Brian Behlendorf [Tue, 18 May 2010 18:13:10 +0000 (11:13 -0700)]
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:09 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
Brian Behlendorf [Tue, 18 May 2010 18:13:06 +0000 (11:13 -0700)]
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:05 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
Brian Behlendorf [Tue, 18 May 2010 18:13:04 +0000 (11:13 -0700)]
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:02 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
Brian Behlendorf [Tue, 18 May 2010 18:13:01 +0000 (11:13 -0700)]
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:13:00 +0000 (11:13 -0700)]
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
Brian Behlendorf [Tue, 18 May 2010 18:12:58 +0000 (11:12 -0700)]
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:12:57 +0000 (11:12 -0700)]
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
Brian Behlendorf [Tue, 18 May 2010 18:12:55 +0000 (11:12 -0700)]
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:12:54 +0000 (11:12 -0700)]
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Brian Behlendorf [Tue, 18 May 2010 18:12:52 +0000 (11:12 -0700)]
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 18:12:50 +0000 (11:12 -0700)]
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Brian Behlendorf [Tue, 18 May 2010 18:06:56 +0000 (11:06 -0700)]
Update COPYRIGHT to include release id LLNL-CODE-403049.
Brian Behlendorf [Tue, 18 May 2010 17:38:46 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:45 +0000 (10:38 -0700)]
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:44 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Brian Behlendorf [Tue, 18 May 2010 17:38:42 +0000 (10:38 -0700)]
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
Brian Behlendorf [Tue, 18 May 2010 17:38:41 +0000 (10:38 -0700)]
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Brian Behlendorf [Tue, 18 May 2010 17:38:39 +0000 (10:38 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch