Commit Graph

2950 Commits

Author SHA1 Message Date
Brian Behlendorf 7fcb1853a4 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-20 15:45:55 -08:00
Brian Behlendorf f42bb765e7 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-01-20 15:45:54 -08:00
Brian Behlendorf cd185f1ce3 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2009-01-20 15:45:54 -08:00
Brian Behlendorf 00fafb5c53 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-01-20 15:45:52 -08:00
Brian Behlendorf 628fa75ed8 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2009-01-20 15:45:52 -08:00
Brian Behlendorf 1294061f7d Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-01-20 15:45:50 -08:00
Brian Behlendorf 6a89150864 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-01-20 15:45:50 -08:00
Brian Behlendorf 25a9c48ccc Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-01-20 15:45:49 -08:00
Brian Behlendorf 41b62d6b5d Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-20 15:45:48 -08:00
Brian Behlendorf 022d01e0d4 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-20 15:45:47 -08:00
Brian Behlendorf 87718a9290 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-20 15:45:46 -08:00
Brian Behlendorf 4710ede86a Add GIT to master 2009-01-20 15:43:44 -08:00
Brian Behlendorf 26d0de9a92 Update Makefiles for recent script updates 2009-01-20 15:43:21 -08:00
Brian Behlendorf cb32a13a57 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-20 15:38:12 -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 8a42ea01cd Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-20 14:17:29 -08:00
Brian Behlendorf 5ae334d138 Use .sh extension 2009-01-20 14:15:05 -08:00
Brian Behlendorf 35dde2f8f5 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-20 14:13:00 -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 7088e53f64 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-16 14:55:01 -08:00
Brian Behlendorf 5bf49743a6 Add minor root check for convenience 2009-01-16 14:51:52 -08:00
Brian Behlendorf 5f5d8ef031 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-16 14:32:08 -08:00
Brian Behlendorf 6a6da5a14d Minor verbage cleanup 2009-01-16 14:29:31 -08:00
Brian Behlendorf 24560b4a89 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-16 13:59:38 -08:00
Brian Behlendorf 7b5ceef9df Minor fixes 2009-01-16 13:57:12 -08:00
Brian Behlendorf 363429e55d Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-16 13:28:10 -08:00
Brian Behlendorf 89ed048230 Minor script updates almost ready to test 2009-01-16 13:25:47 -08:00
Brian Behlendorf cbb892ee60 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-16 12:56:26 -08:00
Brian Behlendorf 7c761d45a8 Further work towards getting zpool-create working 2009-01-16 12:53:12 -08:00
Brian Behlendorf f83ef7e922 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-16 12:11:21 -08:00
Brian Behlendorf b38eb997f4 Update helper scripts to me more helpful 2009-01-16 12:06:25 -08:00
Brian Behlendorf d2f58d7ad8 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 16:42:25 -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 42033b5a29 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 16:31:51 -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 12e9e742e2 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 15:55:09 -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 a0ba3bb0f9 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 15:41:11 -08:00