Commit Graph

23 Commits

Author SHA1 Message Date
Brian Behlendorf 35257bfbd6 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 11:18:11 -08:00
Brian Behlendorf 7973e77bfc Re-add zpool (part of it), we need to build it for the common bits 2008-12-17 11:12:06 -08:00
Brian Behlendorf cf5e58fdf3 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 10:21:11 -08:00
Brian Behlendorf 0209bfd7a4 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 10:20:16 -08:00
Brian Behlendorf 137c1015bd Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 10:20:15 -08:00
Brian Behlendorf d4c1e8b600 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-17 10:20:14 -08:00
Brian Behlendorf 087b2876bb Fix NULL should be 0 usage 2008-12-17 10:18:09 -08:00
Brian Behlendorf f2fff13c54 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 09:25:35 -08:00
Brian Behlendorf 640c2f8d7e Add missing includes to zfs cmd Makefile.am 2008-12-17 09:22:40 -08:00
Brian Behlendorf 4b20a8e329 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 16:58:28 -08:00
Brian Behlendorf 1e64eb4c07 Update makefiles for currently working tools 2008-12-16 16:51:23 -08:00
Brian Behlendorf 151ee60cbf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 09:05:02 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf bc031993d7 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 09:23:08 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 370d47306c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 08:53:03 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf 11e1ce8c2e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 11:36:50 -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 b342e90e44 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 11:24:51 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24: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