Commit Graph

350 Commits

Author SHA1 Message Date
Brian Behlendorf 01918870b4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-16 10:16:00 -08:00
Brian Behlendorf e7d7f1803f Remove unused hunk 2008-12-16 10:14:08 -08:00
Brian Behlendorf fe0f9ebd5c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 10:13:44 -08:00
Brian Behlendorf 3112028a39 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-16 10:13:43 -08:00
Brian Behlendorf b62b556896 Moving unused hunk to unused patch 2008-12-16 10:11:41 -08:00
Brian Behlendorf d918e8e97d Refresh autogen products 2008-12-16 09:12:43 -08:00
Brian Behlendorf b7374fc81b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 09:06:51 -08:00
Brian Behlendorf 4f488ec6e4 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-16 09:06:01 -08:00
Brian Behlendorf 151ee60cbf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 09:05:02 -08:00
Brian Behlendorf e07281deb9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 09:04:47 -08:00
Brian Behlendorf 9fabbb14ad Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 09:04:35 -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 589a6c72d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 09:03:27 -08:00
Brian Behlendorf 3ba34afff8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 09:02:49 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf bffca6c378 Refresh autogen products 2008-12-15 16:58:02 -08:00
Brian Behlendorf b5e5c5c4a6 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-15 09:36:45 -08:00
Brian Behlendorf 5fd645e47a Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-15 09:36:37 -08:00
Brian Behlendorf 579f6e603f Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG 2008-12-15 09:29:26 -08:00
Brian Behlendorf ef88744480 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 15:28:33 -08:00
Brian Behlendorf 7b363155b3 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 15:28:31 -08:00
Brian Behlendorf 5b4fa8eb54 Revert libzfs hunk 2008-12-12 15:26:39 -08:00
Brian Behlendorf a64c093aae Refresh autogen products 2008-12-12 15:18:52 -08:00
Brian Behlendorf f3e6ac6dc9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 15:09:00 -08:00
Brian Behlendorf faf6c753bd Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 15:07:33 -08:00
Brian Behlendorf f6421585ad Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 15:07:29 -08:00
Brian Behlendorf a74ec0ff24 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 15:07:24 -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 2e7dffd82a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 15:07:06 -08:00
Brian Behlendorf 8917e616ba Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 15:06:57 -08:00
Brian Behlendorf 3ce8541e83 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 15:06:41 -08:00
Brian Behlendorf d145044d80 Refresh Makefile 2008-12-12 15:04:48 -08:00
Brian Behlendorf d1837164f8 Refresh autogen products 2008-12-12 14:58:35 -08:00
Brian Behlendorf 634631bafe Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 14:57:51 -08:00
Brian Behlendorf 9787903adb Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:57:13 -08:00
Brian Behlendorf 06a700c073 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 14:57:08 -08:00
Brian Behlendorf 1e0ff074a9 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 14:57:03 -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 dc19f8860e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:56:43 -08:00
Brian Behlendorf d17d4bccd4 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 14:56:35 -08:00
Brian Behlendorf d3ed0c4920 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 14:56:18 -08:00
Brian Behlendorf f154348ca9 Update Makefile 2008-12-12 14:52:43 -08:00
Brian Behlendorf b6ddc3d1a3 Refreshed autogen products 2008-12-12 14:47:15 -08:00
Brian Behlendorf 8e833a1508 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 14:45:03 -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 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 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 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 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 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