Commit Graph

1774 Commits

Author SHA1 Message Date
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 00cab20dfb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-18 09:05:58 -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 4b94ff958a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 17:02:36 -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 59f76052c1 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 16:45:17 -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 ff4d8d7323 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 16:21:53 -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 a092d83131 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 13:53:53 -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 b8aa33f141 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 13:37:44 -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 2b359b1561 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 13:11:16 -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
Brian Behlendorf 8c24ceb793 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 13:04:34 -08:00
Brian Behlendorf 56005b13e1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 13:04:33 -08:00
Brian Behlendorf b5740d86cf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 13:03:57 -08:00
Brian Behlendorf b9fe30002e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 13:03:57 -08:00
Brian Behlendorf fcd7d860e6 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-17 13:03:56 -08:00
Brian Behlendorf e41d37c49d Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 13:03:56 -08:00
Brian Behlendorf fafeacb53f Resolve shadow conflict 2008-12-17 13:01:56 -08:00
Brian Behlendorf e56be59f06 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-17 12:46:59 -08:00
Brian Behlendorf 137b3bb57d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 12:46:57 -08:00
Brian Behlendorf 863ec76ff7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 12:45:53 -08:00
Brian Behlendorf 941e464645 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 12:45:52 -08:00