Commit Graph

2511 Commits

Author SHA1 Message Date
Brian Behlendorf bbb1a0ebaf Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-10 12:45:22 -08:00
Brian Behlendorf 7d4c8081ae Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-10 12:45:17 -08:00
Brian Behlendorf 17ad7b7431 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-10 12:45:16 -08:00
Brian Behlendorf 79163293c0 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-10 12:45:15 -08:00
Brian Behlendorf 8790fcdfdf Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-10 12:45:14 -08:00
Brian Behlendorf 0832cb4651 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2008-12-10 12:45:12 -08:00
Brian Behlendorf 91b3faebcb Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-10 12:45:11 -08:00
Brian Behlendorf f1fd8b8d56 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2008-12-10 12:45:09 -08:00
Brian Behlendorf 1a035f19ac Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-10 12:45:08 -08:00
Brian Behlendorf 5137b305eb Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-10 12:45:05 -08:00
Brian Behlendorf 2811b02a21 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2008-12-10 12:45:05 -08:00
Brian Behlendorf c68ff2b993 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-10 12:45:02 -08:00
Brian Behlendorf 6203c7e50f Removed file 2008-12-10 12:45:00 -08:00
Brian Behlendorf 57fc00a3ab Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-12-10 12:44:49 -08:00
Brian Behlendorf 1afc1fdff6 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-10 12:44:48 -08:00
Brian Behlendorf 7a683e0798 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2008-12-10 12:44:45 -08:00
Brian Behlendorf c09cf7f5a8 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-10 12:44:44 -08:00
Brian Behlendorf c054595fa5 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-10 12:44:42 -08:00
Brian Behlendorf ae3da3aecc Removed file 2008-12-10 12:44:40 -08:00
Brian Behlendorf 19921e591e Removed file 2008-12-10 12:44:08 -08:00
Brian Behlendorf 1b59a53bf5 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-10 12:43:44 -08:00
Brian Behlendorf 9e8b1e836c Remove libumem, we will try and remove this dependency entirely. If we can't then the best move will simply be to use the official library, or build it as a convenience library 2008-12-10 12:43:20 -08:00
Brian Behlendorf deeb049ae2 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-10 12:00:13 -08:00
Brian Behlendorf e3b2a16cc7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-10 12:00:04 -08:00
Brian Behlendorf cda625cdfa Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-10 11:59:08 -08:00
Brian Behlendorf d5c7c0ad86 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-10 11:59:07 -08:00
Brian Behlendorf 279bebaa30 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-10 11:59:04 -08:00
Brian Behlendorf 449999be3f Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-10 11:59:03 -08:00
Brian Behlendorf 97751ff9d5 Fix bad cast 2008-12-10 11:54:08 -08:00
Brian Behlendorf fe0f75b01e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-10 11:32:53 -08:00
Brian Behlendorf 2cc6785050 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-10 11:32:45 -08:00
Brian Behlendorf 486d7cac03 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-10 11:32:09 -08:00
Brian Behlendorf 7baad04134 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-10 11:32:08 -08:00
Brian Behlendorf c0fd117de8 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-10 11:32:08 -08:00
Brian Behlendorf b910a84f6e Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-10 11:32:07 -08:00
Brian Behlendorf 6d4310200c Fix two missing voids in prototypes 2008-12-10 11:30:12 -08:00
Brian Behlendorf 269bb6aba2 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-09 15:56:30 -08:00
Brian Behlendorf 560014612d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-09 15:56:22 -08:00
Brian Behlendorf 40f1eae131 Add libspl includes to libumem 2008-12-09 15:52:41 -08:00
Brian Behlendorf 44f4f623ef Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-09 14:56:54 -08:00
Brian Behlendorf 13835610d7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-09 14:56:47 -08:00
Brian Behlendorf 6c745cd2c8 Update libumem Makefile to reflect new realities 2008-12-09 14:54:45 -08:00
Brian Behlendorf 7a83ce2ade Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-09 14:41:48 -08:00
Brian Behlendorf cac45d6fbd Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-09 14:41:41 -08:00
Brian Behlendorf 28c0e431c0 Refer to moved Makefile 2008-12-09 14:39:45 -08:00
Brian Behlendorf 16696784ca Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-09 14:26:19 -08:00
Brian Behlendorf 68b2db0a48 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-09 14:26:11 -08:00
Brian Behlendorf 7489df5960 Refresh Makefiles for new files 2008-12-09 14:23:45 -08:00
Brian Behlendorf 7696aa2463 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-09 14:17:22 -08:00
Brian Behlendorf 342eb7ef4e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-09 14:17:15 -08:00