Commit Graph

1735 Commits

Author SHA1 Message Date
Brian Behlendorf 012ce813df Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-18 10:06:00 -08:00
Brian Behlendorf e4d1734eb1 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-18 10:05:59 -08:00
Brian Behlendorf 432399da0f Add dropping written variable declaration 2008-12-18 10:03:57 -08:00
Brian Behlendorf 8fa18afc2e Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 10:02:32 -08:00
Brian Behlendorf c5472b82d0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 10:02:19 -08:00
Brian Behlendorf 0a353443cd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 10:01:41 -08:00
Brian Behlendorf 9c0846462b Resolve conflict 2008-12-18 10:01:37 -08:00
Brian Behlendorf c501496c0e Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-18 10:00:47 -08:00
Brian Behlendorf 4df7b421a1 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-18 10:00:46 -08:00
Brian Behlendorf 25a3fca866 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 10:00:45 -08:00
Brian Behlendorf fef6bef576 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-18 10:00:44 -08:00
Brian Behlendorf 9e195d0cbf Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-18 10:00:44 -08:00
Brian Behlendorf c8f253cda8 Now fixed in fix-pthreads branch 2008-12-18 09:58:42 -08:00
Brian Behlendorf 229aba2943 Properly cast thread functions for pthreads 2008-12-18 09:56:22 -08:00
Brian Behlendorf 893ed2fad0 Properly cast thread functions for pthreads 2008-12-18 09:56:05 -08:00
Brian Behlendorf 391f9000dc Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 09:06:10 -08:00
Brian Behlendorf 1e70a9b85c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 09:05:57 -08:00
Brian Behlendorf 6b7c775e09 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 09:05:11 -08:00
Brian Behlendorf 06c9438f79 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 09:05:10 -08:00
Brian Behlendorf b47c472389 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-18 09:05:09 -08:00
Brian Behlendorf cfc42cf0ab Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 09:05:09 -08:00
Brian Behlendorf 0392342e3d Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-18 09:05:08 -08:00
Brian Behlendorf c37308fc20 Resolve stat conflict with stat() 2008-12-18 09:03:02 -08:00
Brian Behlendorf d1684019b4 Move int out of for construct for c90 compliance 2008-12-18 09:01:48 -08:00
Brian Behlendorf 093c1bbe0e Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 17:03:03 -08:00
Brian Behlendorf 511af80b44 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 17:02:34 -08:00
Brian Behlendorf 53e66eef5a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 17:01:14 -08:00
Brian Behlendorf 6e26929ddf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 17:01:12 -08:00
Brian Behlendorf 206825be85 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-17 17:01:10 -08:00
Brian Behlendorf 420137d529 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 17:01:09 -08:00
Brian Behlendorf 194244b80b Resolve read shadow conflict 2008-12-17 16:57:21 -08:00
Brian Behlendorf 7053ff3e65 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 16:45:45 -08:00
Brian Behlendorf eb8725f0f8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 16:45:15 -08:00
Brian Behlendorf f799177730 Add all sources for libzfs userspace funcationality 2008-12-17 16:39:45 -08:00
Brian Behlendorf 7944353976 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 16:22:14 -08:00
Brian Behlendorf 9b81f9448f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 16:21:51 -08:00
Brian Behlendorf 6481bdc3e7 Add -lm linker flag 2008-12-17 16:16:22 -08:00
Brian Behlendorf 720da6c345 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 13:54:06 -08:00
Brian Behlendorf f90df388c2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 13:53:53 -08:00
Brian Behlendorf 1dfec71003 Add -pthreads 2008-12-17 13:51:11 -08:00
Brian Behlendorf 17ce6fed40 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 13:37:56 -08:00
Brian Behlendorf cacdbdba2f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 13:37:44 -08:00
Brian Behlendorf ba3d5afa54 Add missing \ 2008-12-17 13:35:06 -08:00
Brian Behlendorf a7e966d1ce Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 13:11:27 -08:00
Brian Behlendorf c326f72cdc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 13:11:15 -08:00
Brian Behlendorf 07411c1f84 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 13:10:39 -08:00
Brian Behlendorf 6ab9c098f1 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 13:10:39 -08:00
Brian Behlendorf 660a77d6b4 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-17 13:10:38 -08:00
Brian Behlendorf 9842c708fa Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 13:10:38 -08:00
Brian Behlendorf 1e3aeaaef1 Resolve shadow conflict 2008-12-17 13:08:39 -08:00