Commit Graph

370 Commits

Author SHA1 Message Date
Brian Behlendorf ddaad20220 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:16:23 -08:00
Brian Behlendorf a42707fcc0 Resolve conflict with removed cleaner type 2009-01-15 14:16:03 -08:00
Brian Behlendorf da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 86e39f5e3b Resolve conflict with removed cleaner type 2009-01-15 14:05:21 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf d3df6b2012 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-15 14:01:51 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf 87fc3feb38 Refresh autogen products 2009-01-14 16:09:39 -08:00
Brian Behlendorf 6d0121d8de Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 16:05:29 -08:00
Brian Behlendorf 0d8e925476 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-14 16:05:17 -08:00
Brian Behlendorf 9e40470aa0 Resolve conflict 2009-01-14 15:42:28 -08:00
Brian Behlendorf 9c22d76019 Minor 'make check' updates 2009-01-14 15:38:56 -08:00
Brian Behlendorf b289cc1996 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 13:40:44 -08:00
Brian Behlendorf 6db77d2fe2 Add linux-ztest branch 2009-01-14 13:38:07 -08:00
Brian Behlendorf 9855548496 Refresh autogen products 2009-01-09 11:35:52 -08:00
Brian Behlendorf 1f02aaba1c Refresh autogen products 2009-01-05 12:47:00 -08:00
Brian Behlendorf aaefbb4e76 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 12:45:45 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf 9403f4a605 Refresh autogen products 2008-12-23 12:39:25 -08:00
Brian Behlendorf d8c0d57440 Refresh autogen products 2008-12-23 10:41:37 -08:00
Brian Behlendorf a10bb0440c Refresh autogen products 2008-12-22 16:59:25 -08:00
Brian Behlendorf e53b49c61c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 16:58:45 -08:00
Brian Behlendorf fdffe91056 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:55:59 -08:00
Brian Behlendorf 0844495710 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:55:58 -08:00
Brian Behlendorf f3d55cb4f5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 16:55:52 -08:00
Brian Behlendorf 30b961af2c Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 16:55:50 -08:00
Brian Behlendorf 3a76148338 Add a needed lib 2008-12-22 16:52:26 -08:00
Brian Behlendorf 9ef0280a5c Use pthread_ 2008-12-22 16:51:28 -08:00
Brian Behlendorf 683f0b1d6c Fix cast 2008-12-22 16:50:44 -08:00
Brian Behlendorf 626df0d909 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 16:43:41 -08:00
Brian Behlendorf 44f75e4f86 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:40:35 -08:00
Brian Behlendorf e8e738e3b9 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:40:34 -08:00
Brian Behlendorf f016a8e15f Update patch carried forward from old release 2008-12-22 16:35:36 -08:00
Brian Behlendorf dabf7f88f2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 16:34:20 -08:00
Brian Behlendorf 36c5ea8174 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:30:37 -08:00
Brian Behlendorf 43abce68c5 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:30:35 -08:00
Brian Behlendorf 8ab0586445 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 16:30:29 -08:00
Brian Behlendorf a6152094d0 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 16:30:27 -08:00
Brian Behlendorf dee065ca8d Use pthread versions 2008-12-22 16:26:23 -08:00
Brian Behlendorf 6a394806f5 Prototype fixes 2008-12-22 16:18:07 -08:00
Brian Behlendorf 6a45d1043b Refresh autogen products 2008-12-22 16:10:43 -08:00
Brian Behlendorf 7660bc4c74 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 16:09:49 -08:00
Brian Behlendorf 419cff0fd3 Add more more missing headers 2008-12-22 16:02:08 -08:00
Brian Behlendorf 8cee053327 Refresh autogen products 2008-12-22 09:28:14 -08:00
Brian Behlendorf e7d9beb361 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 09:27:41 -08:00
Brian Behlendorf b58e34e0d8 Update makefiles 2008-12-22 09:22:39 -08:00
Brian Behlendorf 3d2e368e7a Refresh autogen products 2008-12-19 16:12:00 -08:00
Brian Behlendorf c312cacdc2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 11:07:27 -08:00
Brian Behlendorf cc92d6497b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf d67cf69e08 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf 9041f66bad Fix all instances of for (int i;;) {} that were easily found 2008-12-19 11:03:54 -08:00
Brian Behlendorf 3da25300e3 Refresh autogen products 2008-12-18 14:02:22 -08:00
Brian Behlendorf 546961cdc0 Add autogen products 2008-12-17 16:24:56 -08:00
Brian Behlendorf 3f95673db0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:24:02 -08:00
Brian Behlendorf 6481bdc3e7 Add -lm linker flag 2008-12-17 16:16:22 -08:00
Brian Behlendorf 3ab12400a0 Refresh autogen products 2008-12-17 13:56:16 -08:00
Brian Behlendorf e3d7813b7d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 13:55:29 -08:00
Brian Behlendorf 1dfec71003 Add -pthreads 2008-12-17 13:51:11 -08:00
Brian Behlendorf d918e8e97d Refresh autogen products 2008-12-16 09:12:43 -08:00
Brian Behlendorf b7374fc81b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 09:06:51 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf bffca6c378 Refresh autogen products 2008-12-15 16:58:02 -08:00
Brian Behlendorf 52de958498 Refresh autogen products 2008-12-12 12:17:51 -08:00
Brian Behlendorf 7297c6d959 Refresh autogen products 2008-12-12 10:31:54 -08:00
Brian Behlendorf 609680b177 Refresh autogen products 2008-12-12 10:20:55 -08:00
Brian Behlendorf 3b4adb0abd Add all autogen products 2008-12-12 09:25:06 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf f07f82e93a Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 11:26:43 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00