Commit Graph

365 Commits

Author SHA1 Message Date
Brian Behlendorf 29be0d44ba Resolve conflict 2008-12-16 16:19:46 -08:00
Brian Behlendorf 4d21a1c977 Resolve two more shadow conflicts 2008-12-16 16:14:19 -08:00
Brian Behlendorf cc53801767 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 15:51:54 -08:00
Brian Behlendorf 12c13fbafb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 15:51:20 -08:00
Brian Behlendorf 4583b6d5ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e14e140b52 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf 3c515284a6 Remove double declaration of char * 2008-12-16 15:49:21 -08:00
Brian Behlendorf f73c835830 Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it. 2008-12-16 15:44:02 -08:00
Brian Behlendorf a4c93e56cc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 14:34:31 -08:00
Brian Behlendorf 79bc1b23ed Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf 53c0cdbc42 Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname 2008-12-16 14:29:35 -08:00
Brian Behlendorf 751ee4041e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 13:30:53 -08:00
Brian Behlendorf 527e38c72b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf 34b937c016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf f693a600d0 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:30:20 -08:00
Brian Behlendorf 206a3ac58c Resolve 2 more shadow conflicts 2008-12-16 13:28:23 -08:00
Brian Behlendorf d54cedd16c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 13:21:55 -08:00
Brian Behlendorf 60ad9afc28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf 5af8235e41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf f82621d7cb Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:19:26 -08:00
Brian Behlendorf 5383875500 Create gcc-shadow branch 2008-12-16 13:19:01 -08:00
Brian Behlendorf ef55a13da8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 09:04:03 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf 23302f57aa Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 16:27:40 -08:00
Brian Behlendorf 0e8ac26fc9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 16:23:07 -08:00
Brian Behlendorf 08a8860091 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-12 16:23:04 -08:00
Brian Behlendorf eee73dd80e Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-12 16:22:59 -08:00
Brian Behlendorf d0c573f27e Add in the reset of the pthread changes 2008-12-12 16:16:06 -08:00
Brian Behlendorf 54cb07032d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 15:07:12 -08:00
Brian Behlendorf d145044d80 Refresh Makefile 2008-12-12 15:04:48 -08:00
Brian Behlendorf f5a62035c7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:56:50 -08:00
Brian Behlendorf f154348ca9 Update Makefile 2008-12-12 14:52:43 -08:00
Brian Behlendorf 96cb73d58b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:44:09 -08:00
Brian Behlendorf cf89e6e4b3 Refresh Makefile 2008-12-12 14:37:13 -08:00
Brian Behlendorf bb4f48461e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:29:28 -08:00
Brian Behlendorf 50532fe67b Refresh Makefile 2008-12-12 14:27:04 -08:00
Brian Behlendorf 2051c5740b Refresh Makefile 2008-12-12 14:26:14 -08:00
Brian Behlendorf 2db44f84d7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:21:02 -08:00
Brian Behlendorf 5a27f3f0a5 Comment out libzpool builds for now 2008-12-12 14:16:50 -08:00
Brian Behlendorf 326eb12f28 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:01:41 -08:00
Brian Behlendorf 01db09fde5 Collapse libzcommon in to libzpool 2008-12-12 13:57:47 -08:00
Brian Behlendorf ea3adc331a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 12:14:52 -08:00
Brian Behlendorf ac9f5a5af0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 12:13:43 -08:00
Brian Behlendorf 0f99484285 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-12 12:13:41 -08:00
Brian Behlendorf 95f0795156 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 12:13:39 -08:00
Brian Behlendorf ea6e9380e7 Add void to prototype 2008-12-12 11:12:11 -08:00
Brian Behlendorf 1cb6a4e6e7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 11:06:59 -08:00
Brian Behlendorf ded433714f Refine Makefiles 2008-12-12 11:04:44 -08:00
Brian Behlendorf 4d54aed828 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:59:19 -08:00
Brian Behlendorf 9fbc572a59 Refine Makefiles 2008-12-12 10:57:05 -08:00
Brian Behlendorf 3b0ebda451 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:44:49 -08:00
Brian Behlendorf d7ec1ed532 Refine Makefiles 2008-12-12 10:43:39 -08:00
Brian Behlendorf 7eb016ef42 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:38:04 -08:00
Brian Behlendorf 76e1c54125 Refine Makefiles 2008-12-12 10:36:14 -08:00
Brian Behlendorf 4846b5850f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:12:32 -08:00
Brian Behlendorf 6d78e69193 Add missing include patch 2008-12-12 10:10:16 -08:00
Brian Behlendorf 8516e2d45e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 09:22:48 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 86b3bb18c3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 08:52:43 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf c95fabb9c7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 16:33:58 -08:00
Brian Behlendorf a0e625a878 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf 182754d11a Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:48 -08:00
Brian Behlendorf d35a0f25fe Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 15:41:45 -08:00
Brian Behlendorf dd32efe6ef Resolve conflict 2008-12-11 15:41:42 -08:00
Brian Behlendorf b8224d752e Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 15:41:29 -08:00
Brian Behlendorf 7e85cefdc5 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 15:41:28 -08:00
Brian Behlendorf d8ab98ca3c Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 15:41:23 -08:00
Brian Behlendorf 1ccd0b2b09 Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 15:40:37 -08:00
Brian Behlendorf aa42812a3d Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 15:40:32 -08:00
Brian Behlendorf 3751fd87e3 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 15:40:25 -08:00
Brian Behlendorf 57799b7b5a Resolve conflict 2008-12-11 15:40:14 -08:00
Brian Behlendorf 3399113552 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 15:39:25 -08:00
Brian Behlendorf 6b2c60acca Moving lib/libspl to linux-libspl branch 2008-12-11 15:38:59 -08:00
Brian Behlendorf e24a59a697 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 15:36:51 -08:00
Brian Behlendorf cf06f2f58f Whoops put these back 2008-12-11 15:34:32 -08:00
Brian Behlendorf 652388f3fb Moving all lib/libspl contexts to linux-libspl branch 2008-12-11 15:31:48 -08:00
Brian Behlendorf 515c1981f2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:59:39 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf 8f8a7e587a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:26:10 -08:00
Brian Behlendorf 503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf 6bc8988bec Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 14:25:21 -08:00
Brian Behlendorf 13d572f7bc Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 14:25:15 -08:00
Brian Behlendorf 1e849d9b3b Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 14:25:08 -08:00
Brian Behlendorf b8294b1311 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 14:25:05 -08:00
Brian Behlendorf 022db7f816 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 14:25:01 -08:00
Brian Behlendorf ec2b4ef2ed Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 14:24:59 -08:00
Brian Behlendorf 9af6637db5 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 14:24:57 -08:00
Brian Behlendorf c325ac879c Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 14:24:56 -08:00
Brian Behlendorf 3e2988aa8b Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 14:24:50 -08:00
Brian Behlendorf 82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf 9b3c631dbd Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 14:24:48 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf 94e1055395 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:04:54 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf 5bb8f9ec25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
Brian Behlendorf f07f82e93a Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 11:26:43 -08:00
Brian Behlendorf 3053990c38 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 11:26:19 -08:00
Brian Behlendorf 84e65c5c1e Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 11:25: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 d6ccbb14c5 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 11:25:28 -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 cdd670cb2f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 11:25:15 -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 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 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 b6097ae55a Remove stray stub kernel files which should be brought in my linux-kernel-module patch 2008-12-02 08:47:21 -08:00
Brian Behlendorf 34dc7c2f25 Initial Linux ZFS GIT Repo 2008-11-20 12:01:55 -08:00