Commit Graph

1814 Commits

Author SHA1 Message Date
Brian Behlendorf 106f128f71 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-20 15:38:19 -08:00
Brian Behlendorf 8e976f7fcf Moving GIT to master for easier reference 2009-01-20 15:35:40 -08:00
Brian Behlendorf af43246767 Minor script cleanup 2009-01-20 15:34:38 -08:00
Brian Behlendorf e460c5ccf7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-20 14:17:36 -08:00
Brian Behlendorf 5ae334d138 Use .sh extension 2009-01-20 14:15:05 -08:00
Brian Behlendorf 84be1f196c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-20 14:13:08 -08:00
Brian Behlendorf db210bf236 Add destroy functionality to zpool create, needed for generic use by zpios.sh 2009-01-20 14:10:30 -08:00
Brian Behlendorf 13a2ef20ed Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-16 14:55:08 -08:00
Brian Behlendorf 5bf49743a6 Add minor root check for convenience 2009-01-16 14:51:52 -08:00
Brian Behlendorf 3532303b80 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-16 14:32:14 -08:00
Brian Behlendorf 6a6da5a14d Minor verbage cleanup 2009-01-16 14:29:31 -08:00
Brian Behlendorf 393c858e47 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-16 13:59:45 -08:00
Brian Behlendorf 7b5ceef9df Minor fixes 2009-01-16 13:57:12 -08:00
Brian Behlendorf e2962d71fd Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-16 13:28:17 -08:00
Brian Behlendorf 89ed048230 Minor script updates almost ready to test 2009-01-16 13:25:47 -08:00
Brian Behlendorf 6db4c9637f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-16 12:56:33 -08:00
Brian Behlendorf 7c761d45a8 Further work towards getting zpool-create working 2009-01-16 12:53:12 -08:00
Brian Behlendorf 24f3d85fd0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-16 12:11:34 -08:00
Brian Behlendorf b38eb997f4 Update helper scripts to me more helpful 2009-01-16 12:06:25 -08:00
Brian Behlendorf 75a0fcf23f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 16:42:43 -08:00
Brian Behlendorf 2f2120f885 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 16:41:09 -08:00
Brian Behlendorf 498800d66a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 16:41:07 -08:00
Brian Behlendorf e9a0807176 Remove fix-locks dependency this topic branch was accepted upstream and can now be removed 2009-01-15 16:36:11 -08:00
Brian Behlendorf 41cba9f136 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 16:32:08 -08:00
Brian Behlendorf fb256294c9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 16:30:29 -08:00
Brian Behlendorf c5b335f613 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 16:30:28 -08:00
Brian Behlendorf 68be1291b7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-15 16:30:26 -08:00
Brian Behlendorf 31cddc8a0b Merge branch 'fix-locks' into refs/top-bases/fix-branch 2009-01-15 16:30:25 -08:00
Brian Behlendorf 50186c2b57 All init and destroy initialized pulled in 2009-01-15 16:25:25 -08:00
Brian Behlendorf 7d4fe54632 txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions 2009-01-15 16:22:23 -08:00
Brian Behlendorf 99a9817275 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 15:55:17 -08:00
Brian Behlendorf 85c77e1c82 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:54:35 -08:00
Brian Behlendorf ee7f10a6b3 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 15:54:34 -08:00
Brian Behlendorf 38c24b7107 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-15 15:54:33 -08:00
Brian Behlendorf bd01208d25 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-01-15 15:54:33 -08:00
Brian Behlendorf cf9a5530e1 Fix pthreads prototype 2009-01-15 15:52:12 -08:00
Brian Behlendorf f793af51b4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 15:41:19 -08:00
Brian Behlendorf 0197f3a298 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 975c613269 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 61ec157623 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-15 15:40:38 -08:00
Brian Behlendorf 51730cdeae Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:40:37 -08:00
Brian Behlendorf 37a3478d58 Resolve C90 int declared in for() construct 2009-01-15 15:38:26 -08:00
Brian Behlendorf 9c8802c7e4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 15:29:55 -08:00
Brian Behlendorf 8511545409 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:29:15 -08:00
Brian Behlendorf fa36244fba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:29:14 -08:00
Brian Behlendorf 4cb119f61f Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-15 15:29:14 -08:00
Brian Behlendorf 4c0be07ad9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:29:13 -08:00
Brian Behlendorf 22284754e0 Resolve C90 int declared in for() construct 2009-01-15 15:26:54 -08:00
Brian Behlendorf 141235d905 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 14:52:47 -08:00
Brian Behlendorf 63722ea81a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:52:04 -08:00