Commit Graph

91 Commits

Author SHA1 Message Date
Brian Behlendorf 0172b08863 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 10:03:25 -08:00
Brian Behlendorf 4d86e8fa92 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:44 -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 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 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 1c78d7d61d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 09:36:25 -08:00
Brian Behlendorf fe5b927a4a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:36:22 -08:00
Brian Behlendorf 0a6ac25d10 Add vmem_ interface mapping for user space 2008-12-18 09:34:27 -08:00
Brian Behlendorf e637016382 Refresh autogen products 2008-12-17 16:48:35 -08:00
Brian Behlendorf addd4c977d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:47:36 -08:00
Brian Behlendorf c27a2516c2 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 16:43:55 -08:00
Brian Behlendorf f799177730 Add all sources for libzfs userspace funcationality 2008-12-17 16:39:45 -08:00
Brian Behlendorf effc496583 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:37:56 -08:00
Brian Behlendorf e0f0e02636 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:36:22 -08:00
Brian Behlendorf 5ea99efac7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:36:20 -08:00
Brian Behlendorf 676ab35598 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:19 -08:00
Brian Behlendorf 0106dabb11 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-17 11:36:18 -08:00
Brian Behlendorf a681d70e28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:17 -08:00
Brian Behlendorf e532f6bef4 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:36:16 -08:00
Brian Behlendorf 8af904a4b0 Resolve index shadowing /usr/include/string.h:304 2008-12-17 11:34:19 -08:00
Brian Behlendorf ed9a35324d Not sure why Sun needed to remove these externs, but I need them back 2008-12-17 11:32:47 -08:00
Brian Behlendorf 7c5c932505 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:28:54 -08:00
Brian Behlendorf 01e5ef8ebe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:27:23 -08:00
Brian Behlendorf 25db7e9413 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:27:21 -08:00
Brian Behlendorf 935fd6c681 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:27:20 -08:00
Brian Behlendorf 55c8582174 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:27:19 -08:00
Brian Behlendorf dcf0fb9ffb Resolve shadow conflicts 2008-12-17 11:25:21 -08:00
Brian Behlendorf 994a616c30 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 09:50:58 -08:00
Brian Behlendorf 204ec2e8f4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-17 09:50:56 -08:00
Brian Behlendorf bcbf74fead Remove assert/verify support from zfs_context, moved to assert.h 2008-12-17 09:49:02 -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 3ba34afff8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 09:02:49 -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 ee209a7614 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 16:30:32 -08:00
Brian Behlendorf 416157170a Resolve conflict 2008-12-12 16:25:01 -08:00
Brian Behlendorf 0e8ac26fc9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 16:23:07 -08:00
Brian Behlendorf 08a8860091 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-12 16:23:04 -08:00
Brian Behlendorf eee73dd80e Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-12 16:22:59 -08:00
Brian Behlendorf d0c573f27e Add in the reset of the pthread changes 2008-12-12 16:16:06 -08:00
Brian Behlendorf b7a979da7b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 16:09:38 -08:00
Brian Behlendorf c264712b93 Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch 2008-12-12 16:09:33 -08:00
Brian Behlendorf d07c7914a0 Refresh context for assert 2008-12-12 16:02:48 -08:00
Brian Behlendorf 15218256e4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 15:37:44 -08:00