Commit Graph

2802 Commits

Author SHA1 Message Date
Brian Behlendorf 8bb9b8305a Export new quota related symbols. 2009-07-10 11:38:53 -07:00
Brian Behlendorf e16ffab302 SPLBUILD now includes modules 2009-07-10 11:37:30 -07:00
Brian Behlendorf e5d6b866f7 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-10 10:52:13 -07:00
Brian Behlendorf ca2e8a0a7f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-10 10:52:11 -07:00
Brian Behlendorf 4baa59ce44 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-10 10:50:13 -07:00
Brian Behlendorf cfec48619c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-10 10:50:12 -07:00
Brian Behlendorf 1817377ecd Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-10 10:50:11 -07:00
Brian Behlendorf 84b52133f3 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-10 10:50:10 -07:00
Brian Behlendorf f3c55459b0 Pull ; in to macro to ensure it get's entirely removed, C90 issue. 2009-07-10 10:40:55 -07:00
Brian Behlendorf ac47fd1d1f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-09 15:09:51 -07:00
Brian Behlendorf f8938a398f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 15:09:50 -07:00
Brian Behlendorf 24662d61d9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 15:08:06 -07:00
Brian Behlendorf 2f4e745a09 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 15:08:04 -07:00
Brian Behlendorf 893e11c6be Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-09 15:08:03 -07:00
Brian Behlendorf bed14af385 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-07-09 15:08:03 -07:00
Brian Behlendorf ae132945b4 Add suggested paranthesis. 2009-07-09 14:59:10 -07:00
Brian Behlendorf 176ce8248a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-09 13:19:17 -07:00
Brian Behlendorf db193d4ca9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 13:19:15 -07:00
Brian Behlendorf 17d368fa5f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 13:17:27 -07:00
Brian Behlendorf a3bc97c2c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 13:17:26 -07:00
Brian Behlendorf 947db84a82 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-09 13:17:25 -07:00
Brian Behlendorf 9ad0fef49e Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Conflicts:

	module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
Brian Behlendorf 683b2f0d00 TopGit missed this update when I updated the same line in the
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'.  I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
Brian Behlendorf 8551a101ea Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-09 12:25:34 -07:00
Brian Behlendorf 0c3f631b72 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 12:25:32 -07:00
Brian Behlendorf c4c4afd8fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 12:23:41 -07:00
Brian Behlendorf 6db8882b78 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 12:23:39 -07:00
Brian Behlendorf 14445eaa8e Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-09 12:23:37 -07:00
Brian Behlendorf 76bf02aebb Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-09 12:23:36 -07:00
Brian Behlendorf 076406cfe3 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-07-09 12:23:35 -07:00
Brian Behlendorf a551134b2f Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:14:56 -07:00
Brian Behlendorf a19906fe65 Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:13:56 -07:00
Brian Behlendorf f1d99c0653 Revert to original debugging code and wrap any variabled used only
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out.  This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
2009-07-09 12:10:52 -07:00
Brian Behlendorf 19e8f65be3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-09 10:41:31 -07:00
Brian Behlendorf 64e827d295 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 10:41:30 -07:00
Brian Behlendorf e5e94c40f7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 10:39:44 -07:00
Brian Behlendorf aa8ed32ee8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 10:39:43 -07:00
Brian Behlendorf b2eb5a454b Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-09 10:39:42 -07:00
Brian Behlendorf 9e394e10a9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-09 10:39:41 -07:00
Brian Behlendorf 43af29de5f Type int accidentally not declared at the top of the function. 2009-07-09 10:19:02 -07:00
Brian Behlendorf cc6e67fa7f Wrap sysevent includes until sysevent or something like it is implemented. 2009-07-09 08:40:33 -07:00
Brian Behlendorf 66b89947fa Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-08 16:10:01 -07:00
Brian Behlendorf 664f17e68b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 16:09:59 -07:00
Brian Behlendorf 8070ba7bea Untracked pthread changes which must have accidentally crept in.
This is exactly the reason why I want a new topgit command which
takes the base, then incrementally applies all the patches and
compares them againsts what is actually committed.  This would
ensure this sort of thing doesn't happen!
2009-07-08 15:58:28 -07:00
Brian Behlendorf be5ff6fcdd Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-08 15:02:33 -07:00
Brian Behlendorf d95ee13c20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 15:02:31 -07:00
Brian Behlendorf 058a25a017 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 15:00:43 -07:00
Brian Behlendorf 275d66171b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-08 15:00:41 -07:00
Brian Behlendorf 151315f7cb Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-07-08 15:00:40 -07:00
Brian Behlendorf fa35bfd3cf Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-07-08 15:00:39 -07:00