Commit Graph

1658 Commits

Author SHA1 Message Date
Brian Behlendorf eccb6aa8e4 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-13 13:33:36 -08:00
Brian Behlendorf f8b66dcc4f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 13:32:31 -08:00
Brian Behlendorf 16c26fa9cd Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-13 13:32:30 -08:00
Brian Behlendorf 8ad629750e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-13 13:32:30 -08:00
Brian Behlendorf bb9b10a830 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-13 13:32:29 -08:00
Brian Behlendorf b73b29ab8e Fix c90 issue with { } 2009-01-13 13:30:35 -08:00
Brian Behlendorf 35a3d014c5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-13 11:57:31 -08:00
Brian Behlendorf bba6e9829d Handle the case when 'module-name=' is passed down without args. This is handy and shouldn't generate warnings 2009-01-13 11:54:38 -08:00
Brian Behlendorf 1fd9167bc0 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 15:11:25 -08:00
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf 0f48a52f65 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 14:46:10 -08:00
Brian Behlendorf ff09d64647 Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches 2009-01-09 14:37:45 -08:00
Brian Behlendorf f4ae82d019 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 14:18:52 -08:00
Brian Behlendorf 6b32aaea67 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 14:17:49 -08:00
Brian Behlendorf 86eb46d20b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 14:17:49 -08:00
Brian Behlendorf 0e3bb44848 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-09 14:17:48 -08:00
Brian Behlendorf 578c9645df Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-09 14:17:48 -08:00
Brian Behlendorf 902ce659b0 Fix c90 compliance issue 2009-01-09 14:15:56 -08:00
Brian Behlendorf c6ddafc107 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 13:34:15 -08:00
Brian Behlendorf 7a7a074d3d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 13:33:11 -08:00
Brian Behlendorf cd5e331e68 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 13:33:10 -08:00
Brian Behlendorf fb79976d3c Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-09 13:33:10 -08:00
Brian Behlendorf 953d302b87 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-01-09 13:33:09 -08:00
Brian Behlendorf 04638ead67 Change zpool module name to zfs and update references 2009-01-09 13:31:16 -08:00
Brian Behlendorf ca4fc6ef63 Fix cast 2009-01-09 13:29:41 -08:00
Brian Behlendorf 741b7a18ac Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 12:49:24 -08:00
Brian Behlendorf 129afe3ce8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 12:46:44 -08:00
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 9ef4ad022a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 11:32:09 -08:00
Brian Behlendorf d7f4512ed3 Quiet warnings for now 2009-01-09 11:29:00 -08:00
Brian Behlendorf 58fe3421b7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 09:22:54 -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 7aa850cbd1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-08 16:27:27 -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 b25dd08bc2 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-08 11:01:16 -08:00
Brian Behlendorf 4802584080 Update execute permissions 2009-01-08 10:57:24 -08:00
Brian Behlendorf 9d335bca85 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-08 10:28:47 -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 3cffd4f196 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-07 15:53:01 -08:00
Brian Behlendorf 2a76f03369 Update distfiles 2009-01-07 15:49:36 -08:00
Brian Behlendorf 0b8e8ad2c4 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-06 13:46:26 -08:00
Brian Behlendorf 6280843d13 Remove until it can be updated 2009-01-06 13:43:53 -08:00
Brian Behlendorf 791ca841bd Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-06 13:17:06 -08:00
Brian Behlendorf f9494f2bb1 Build missing sources 2009-01-06 13:14:30 -08:00
Brian Behlendorf 61032f1ce6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-06 09:30:54 -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