Commit Graph

562 Commits

Author SHA1 Message Date
Brian Behlendorf 9b1a5db258 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 14:44:51 -08:00
Brian Behlendorf a955848091 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:44:30 -08:00
Brian Behlendorf d36ee76b0c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 14:44:25 -08:00
Brian Behlendorf 52044a9601 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 14:44:21 -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 2085d7ed6e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:44:02 -08:00
Brian Behlendorf d2fb78a491 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 14:43:53 -08:00
Brian Behlendorf 17d90b5122 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 14:43:37 -08:00
Brian Behlendorf cf89e6e4b3 Refresh Makefile 2008-12-12 14:37:13 -08:00
Brian Behlendorf 513e08f273 Refresh autogen products 2008-12-12 14:31:17 -08:00
Brian Behlendorf 3e21557c1c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 14:30:22 -08:00
Brian Behlendorf b1af545c03 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 14:30:10 -08:00
Brian Behlendorf eb18d4f4b2 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:29:48 -08:00
Brian Behlendorf 59af9d5f3d Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 14:29:44 -08:00
Brian Behlendorf a7450f7d3e Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 14:29:40 -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 1cac8533a1 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:29:21 -08:00
Brian Behlendorf 73b709fa62 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 14:29:12 -08:00
Brian Behlendorf 00fa98c5cf Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 14:28:56 -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 52de958498 Refresh autogen products 2008-12-12 12:17:51 -08:00
Brian Behlendorf 7297c6d959 Refresh autogen products 2008-12-12 10:31:54 -08:00
Brian Behlendorf 609680b177 Refresh autogen products 2008-12-12 10:20:55 -08:00
Brian Behlendorf 3b4adb0abd Add all autogen products 2008-12-12 09:25:06 -08:00
Brian Behlendorf 450502ec0b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 09:23:28 -08:00
Brian Behlendorf bc031993d7 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 09:23:08 -08:00
Brian Behlendorf efbf9637d4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 09:23:03 -08:00
Brian Behlendorf 2ad15bb834 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 09:22:59 -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 fdb922a832 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 09:22:42 -08:00
Brian Behlendorf 7f2347ed6c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 09:22:34 -08:00
Brian Behlendorf c1a800e4c5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:19 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 686c93db12 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 15:00:23 -08:00
Brian Behlendorf 477a85d905 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 15:00:01 -08:00
Brian Behlendorf 6d37a4ad97 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 14:59:57 -08:00
Brian Behlendorf d68cecbb9d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 14:59:52 -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 f46d4ce0a4 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 14:59:32 -08:00
Brian Behlendorf f27584417a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 14:59:24 -08:00
Brian Behlendorf a3c66a6b89 Resolve conflict 2008-12-11 14:58:34 -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 645c51287f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 11:37:35 -08:00
Brian Behlendorf 11e1ce8c2e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 11:36:50 -08:00
Brian Behlendorf 076f7c6a5f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 11:36:40 -08:00
Brian Behlendorf 7515df142f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 11:36:31 -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 4003bc5b2c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 11:35:48 -08:00
Brian Behlendorf 1b0348e335 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 11:35:29 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -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 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 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