Commit Graph

12846 Commits

Author SHA1 Message Date
Brian Behlendorf 9f7ebe68b8 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:36 -07:00
Brian Behlendorf 0fd4be9ebb Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-01 14:40:34 -07:00
Brian Behlendorf 555d4e9f14 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:29 -07:00
Brian Behlendorf e8653721f0 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-01 14:40:27 -07:00
Brian Behlendorf ff22d09ad7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:21 -07:00
Brian Behlendorf 991c35bdf8 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-01 14:40:19 -07:00
Brian Behlendorf c5e902ec33 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-01 14:40:13 -07:00
Brian Behlendorf 40f0b870a9 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-01 14:40:11 -07:00
Brian Behlendorf 6e50f53cb1 Drop --with-linux and --with-spl options from user build. 2009-07-01 14:35:38 -07:00
Brian Behlendorf e0134d1f30 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:53 -07:00
Brian Behlendorf e23df6a9a1 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-01 12:57:51 -07:00
Brian Behlendorf 89bb949dfd Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:46 -07:00
Brian Behlendorf b4a4ebf6f7 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-01 12:57:44 -07:00
Brian Behlendorf ad0c55b597 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:39 -07:00
Brian Behlendorf cf1809ed2f Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-01 12:57:37 -07:00
Brian Behlendorf f2d80ee1f5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:32 -07:00
Brian Behlendorf bd2e01b87e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-01 12:57:31 -07:00
Brian Behlendorf bdcf52a8fd Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:25 -07:00
Brian Behlendorf 82b05a5f5e Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-01 12:57:24 -07:00
Brian Behlendorf 02d57b0279 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:18 -07:00
Brian Behlendorf bda70d17d9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-01 12:57:17 -07:00
Brian Behlendorf 531a1efe94 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:11 -07:00
Brian Behlendorf 2920a20e50 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-01 12:57:10 -07:00
Brian Behlendorf f64a2081a7 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:05 -07:00
Brian Behlendorf 49333d5f0c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-01 12:57:03 -07:00
Brian Behlendorf a9d90a9cc4 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-01 12:56:58 -07:00
Brian Behlendorf 3bf981d8f5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-01 12:56:56 -07:00
Brian Behlendorf 7c64535996 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-01 12:56:51 -07:00
Brian Behlendorf 111fe4dcdd Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-01 12:56:49 -07:00
Brian Behlendorf fda743d133 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-01 12:56:44 -07:00
Brian Behlendorf c7f5ffc367 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-01 12:56:42 -07:00
Brian Behlendorf 053d627b51 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-01 12:56:37 -07:00
Brian Behlendorf 3ba005afd9 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-01 12:56:35 -07:00
Brian Behlendorf 613aba41ce Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-01 12:56:35 -07:00
Brian Behlendorf 9fdb48a38a Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-01 12:56:25 -07:00
Brian Behlendorf c6cadcda99 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-01 12:56:24 -07:00
Brian Behlendorf 5bf6d6d222 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-01 12:56:23 -07:00
Brian Behlendorf 7fd773b4c3 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-01 12:56:14 -07:00
Brian Behlendorf a1b0407a08 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-01 12:56:12 -07:00
Brian Behlendorf 8d57b04d71 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-01 12:56:07 -07:00
Brian Behlendorf 7a49047fd6 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-01 12:56:05 -07:00
Brian Behlendorf 1b5d25db92 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-01 12:56:00 -07:00
Brian Behlendorf c8e31ed14b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-01 12:55:58 -07:00
Brian Behlendorf 01ebe71940 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-01 12:55:53 -07:00
Brian Behlendorf fd41a15412 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-01 12:55:51 -07:00
Brian Behlendorf 580f419bbd Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-01 12:55:46 -07:00
Brian Behlendorf b0c55bfd41 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-01 12:55:44 -07:00
Brian Behlendorf 5cb11f4ffd Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-01 12:55:39 -07:00
Brian Behlendorf 816b16dd08 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-01 12:55:37 -07:00
Brian Behlendorf a749706736 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-01 12:55:32 -07:00