Commit Graph

2431 Commits

Author SHA1 Message Date
Brian Behlendorf b4d27767d8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 12:46:42 -08:00
Brian Behlendorf d64233083d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-09 12:46:41 -08:00
Brian Behlendorf b3064162aa Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-01-09 12:46:40 -08:00
Brian Behlendorf cb5fc9440b Remove extra defaults 2009-01-09 12:42:27 -08:00
Brian Behlendorf 6bf5694a1a Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-09 11:31:16 -08:00
Brian Behlendorf d7f4512ed3 Quiet warnings for now 2009-01-09 11:29:00 -08:00
Brian Behlendorf 814d344f5e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-09 09:22:01 -08:00
Brian Behlendorf 91b9bf3f40 Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues 2009-01-09 09:19:33 -08:00
Brian Behlendorf c1233efa86 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-08 16:25:33 -08:00
Brian Behlendorf cd0b9c18b7 Update helper scripts 2009-01-08 16:20:25 -08:00
Brian Behlendorf 0e5efe5ab4 Update helper scripts 2009-01-08 16:19:38 -08:00
Brian Behlendorf cf4ec4a4b0 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-08 11:00:23 -08:00
Brian Behlendorf 4802584080 Update execute permissions 2009-01-08 10:57:24 -08:00
Brian Behlendorf 008408a40f Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-08 10:27:55 -08:00
Brian Behlendorf b457fb49f9 Remove vdev_disk from userspace build, vdev_file is used 2009-01-08 10:23:59 -08:00
Brian Behlendorf 75bb408816 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-07 15:52:06 -08:00
Brian Behlendorf 2a76f03369 Update distfiles 2009-01-07 15:49:36 -08:00
Brian Behlendorf 90e9027764 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-06 13:45:43 -08:00
Brian Behlendorf 6280843d13 Remove until it can be updated 2009-01-06 13:43:53 -08:00
Brian Behlendorf 3cb3b446f7 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-06 13:16:23 -08:00
Brian Behlendorf f9494f2bb1 Build missing sources 2009-01-06 13:14:30 -08:00
Brian Behlendorf 9419d8aba2 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-06 09:30:10 -08:00
Brian Behlendorf 5f9b0590f5 Remove zfs_fuid for now from kernel source until needed by ZPL 2009-01-06 09:28:09 -08:00
Brian Behlendorf e74d893984 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 16:38:39 -08:00
Brian Behlendorf 9d4d588938 Comment out until ZPL implemented 2009-01-05 16:34:01 -08:00
Brian Behlendorf bca6b89acf Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 15:44:46 -08:00
Brian Behlendorf 760d78b9f8 Move default include paths after custom include paths so local stuff gets picked up first 2009-01-05 15:42:56 -08:00
Brian Behlendorf 5256559dd6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 14:28:14 -08:00
Brian Behlendorf a4ecacdad7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 14:28:00 -08:00
Brian Behlendorf 93e72d1102 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-05 14:27:59 -08:00
Brian Behlendorf f2d8d8666a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-05 14:27:59 -08:00
Brian Behlendorf 854fda6d70 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-01-05 14:27:58 -08:00
Brian Behlendorf 12ee6d57c8 Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true 2009-01-05 14:26:16 -08:00
Brian Behlendorf ca09b22dfb Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 13:46:17 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 74959ab27b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 13:15:39 -08:00
Brian Behlendorf 861ec17294 Update libunicode 2009-01-05 13:13:50 -08:00
Brian Behlendorf ce248fc03d Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 12:39:45 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf ced77c2f1b Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
Brian Behlendorf 8f84787f03 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 12:09:46 -08:00
Brian Behlendorf 07c6176130 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 12:09:06 -08:00
Brian Behlendorf 1a26b866ef Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-01-05 12:09:04 -08:00
Brian Behlendorf 596fa26882 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-01-05 12:09:03 -08:00
Brian Behlendorf 7641911aec Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-01-05 12:09:01 -08:00
Brian Behlendorf 52bc9eee2b Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-05 12:09:00 -08:00
Brian Behlendorf 5da5d30ced Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-05 12:08:57 -08:00
Brian Behlendorf 7a187ce223 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-05 12:08:55 -08:00
Brian Behlendorf b5d83ce4f0 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-01-05 12:08:54 -08:00
Brian Behlendorf 5e814ba757 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-01-05 12:08:53 -08:00