Commit Graph

2478 Commits

Author SHA1 Message Date
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf 11cf0f3f8c Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-11 11:25:38 -08:00
Brian Behlendorf 650704aee3 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-11 11:25:35 -08:00
Brian Behlendorf 3f25e7cd69 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 11:25:34 -08:00
Brian Behlendorf 4cc662d833 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2008-12-11 11:25:29 -08:00
Brian Behlendorf d6ccbb14c5 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 11:25:28 -08:00
Brian Behlendorf fb35bdb6b6 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2008-12-11 11:25:23 -08:00
Brian Behlendorf ff282a978f Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 11:25:22 -08:00
Brian Behlendorf bbfd8ed9e3 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2008-12-11 11:25:16 -08:00
Brian Behlendorf cdd670cb2f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 11:25:15 -08:00
Brian Behlendorf 751eae9078 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-11 11:25:10 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -08:00
Brian Behlendorf d409139b12 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-12-11 11:25:04 -08:00
Brian Behlendorf d390fb2a95 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-11 11:25:03 -08:00
Brian Behlendorf 4d6588043b Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2008-12-11 11:24:58 -08:00
Brian Behlendorf 3cb7c6035e Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-11 11:24:57 -08:00
Brian Behlendorf f321bfed24 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-11 11:24:52 -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 b453b61272 Fix libspl move to the wrong place 2008-12-11 11:22:02 -08:00
Brian Behlendorf 4b7ee081ce Fix typo 2008-12-11 11:16:38 -08:00
Brian Behlendorf 77755a5771 Add a few missing files 2008-12-11 11:14:49 -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
Brian Behlendorf 268ce9d611 Don't sweat zpool for now 2008-12-10 16:42:30 -08:00
Brian Behlendorf c77aacc190 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 16:30:02 -08:00
Brian Behlendorf 327e3795a3 Move include_next outside #ifndef 2008-12-10 16:25:59 -08:00
Brian Behlendorf f9424a347f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 16:17:29 -08:00
Brian Behlendorf d87892df0c Move fixes 2008-12-10 16:10:47 -08:00
Brian Behlendorf 199e2ebf16 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 15:58:54 -08:00
Brian Behlendorf 3074d10601 Move some time types 2008-12-10 15:57:02 -08:00
Brian Behlendorf 695f8589f4 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 15:51:57 -08:00
Brian Behlendorf df91e02549 Move some headers 2008-12-10 15:50:04 -08:00
Brian Behlendorf 16bf84ee9b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 15:47:21 -08:00
Brian Behlendorf 17a7e08b50 Move out of static inline to real function 2008-12-10 15:45:25 -08:00
Brian Behlendorf 2948fe19f6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 14:44:01 -08:00
Brian Behlendorf 2a7a475196 Add getexecname to Makefiles 2008-12-10 14:42:09 -08:00
Brian Behlendorf 85066e4acf Remove unneeded includes 2008-12-10 14:39:52 -08:00
Brian Behlendorf a26dfeacbb Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 14:14:16 -08:00
Brian Behlendorf 21056826ec Add missing assert.h 2008-12-10 14:12:26 -08:00
Brian Behlendorf 8d3fc10b21 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 14:02:03 -08:00
Brian Behlendorf 7fdedffcfd Add 3 missing headers 2008-12-10 13:59:59 -08:00
Brian Behlendorf 349fa9891f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:51 -08:00
Brian Behlendorf aa52f01a88 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-10 13:32:50 -08:00
Brian Behlendorf 4de6172e16 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:46 -08:00
Brian Behlendorf 1e76884533 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-10 13:32:45 -08:00
Brian Behlendorf ec85d8aeac Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:42 -08:00
Brian Behlendorf d6e05caf13 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-10 13:32:40 -08:00
Brian Behlendorf 8b6083604f Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:37 -08:00
Brian Behlendorf 90b73736b6 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-10 13:32:35 -08:00