Commit Graph

12620 Commits

Author SHA1 Message Date
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
Brian Behlendorf 76ffd33eae Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-01 12:55:30 -07:00
Brian Behlendorf 01ff9d82d5 Install zfs_config, zfs_unconfig, symbols in to correct location.
Provide a zfs.release file as part of the package.
2009-07-01 12:51:06 -07:00
Brian Behlendorf 5974d1d85e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-01 11:36:21 -07:00
Brian Behlendorf 63845164a6 Use $(RM) macro to ensure -f is passed.
Preserve path for installed headers with nobase.
2009-07-01 11:31:47 -07:00
Brian Behlendorf 2f5dd8c3c3 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:57 -07:00
Brian Behlendorf ab4146db46 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-01 11:11:55 -07:00
Brian Behlendorf b321946648 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:50 -07:00
Brian Behlendorf df388bfc0a Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-01 11:11:48 -07:00
Brian Behlendorf e956869d17 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:43 -07:00
Brian Behlendorf a5e9c5bc65 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-01 11:11:41 -07:00
Brian Behlendorf 1d0a30f5a5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:36 -07:00
Brian Behlendorf 685b7d85d3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-01 11:11:34 -07:00
Brian Behlendorf bd840df630 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:29 -07:00
Brian Behlendorf 94390a0793 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-01 11:11:27 -07:00
Brian Behlendorf cdec7ff523 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:22 -07:00
Brian Behlendorf d959a6177a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-01 11:11:20 -07:00
Brian Behlendorf c198cbe54f Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:14 -07:00
Brian Behlendorf 9fd939766f Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-01 11:11:12 -07:00
Brian Behlendorf 06652dd306 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:07 -07:00
Brian Behlendorf 518b58f35b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-01 11:11:05 -07:00
Brian Behlendorf 4339e96c34 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-01 11:11:00 -07:00
Brian Behlendorf 10c43094ed Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-01 11:10:58 -07:00
Brian Behlendorf 29b022a4b1 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-01 11:10:53 -07:00
Brian Behlendorf 3c96976b99 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-01 11:10:51 -07:00
Brian Behlendorf 4cac8c23ea Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-01 11:10:46 -07:00