Commit Graph

10990 Commits

Author SHA1 Message Date
Brian Behlendorf 048d7dcc06 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-10 21:39:03 -07:00
Brian Behlendorf f2499f448a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-10 21:39:00 -07:00
Brian Behlendorf 4911b7be4d zpios subdir should be on linux-zpios branch 2009-03-10 21:33:24 -07:00
Brian Behlendorf 31a03f7f2f Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-03-10 21:31:03 -07:00
Brian Behlendorf 43bbfb6abb Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-10 21:31:00 -07:00
Brian Behlendorf cdadb311a3 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-10 21:30:51 -07:00
Brian Behlendorf 66a5ec0f7b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-10 21:30:48 -07:00
Brian Behlendorf e3a8c2f770 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-03-10 21:30:38 -07:00
Brian Behlendorf 9eba109484 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-10 21:30:35 -07:00
Brian Behlendorf 575d6ea2e0 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-10 21:30:26 -07:00
Brian Behlendorf 7ca5d85ab6 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-10 21:30:24 -07:00
Brian Behlendorf 23f935377e Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-10 21:30:14 -07:00
Brian Behlendorf 6bf18caf9f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
Conflicts:

	module/Makefile.in
2009-03-10 21:29:58 -07:00
Brian Behlendorf d1c012214a Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-03-10 21:28:58 -07:00
Brian Behlendorf 171086af52 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-10 21:28:53 -07:00
Brian Behlendorf 79b9b948a7 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-03-10 21:28:43 -07:00
Brian Behlendorf 8fa22f3ddc Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-03-10 21:28:40 -07:00
Brian Behlendorf 7d79ace30e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-03-10 21:28:31 -07:00
Brian Behlendorf 8cd1a22759 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-10 21:28:27 -07:00
Brian Behlendorf b70f94ba8e Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-03-10 21:28:17 -07:00
Brian Behlendorf 88f71167ae Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-10 21:28:14 -07:00
Brian Behlendorf 34b4f20231 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-10 21:28:04 -07:00
Brian Behlendorf be8904440b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-10 21:28:01 -07:00
Brian Behlendorf a8a0bb91fd Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-03-10 21:27:52 -07:00
Brian Behlendorf 370b674e09 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-10 21:27:49 -07:00
Brian Behlendorf 93c2a73826 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-03-10 21:27:39 -07:00
Brian Behlendorf f65339a529 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-10 21:27:34 -07:00
Brian Behlendorf 8b5bcbd6d2 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-10 21:27:25 -07:00
Brian Behlendorf 799aae7107 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-10 21:27:22 -07:00
Brian Behlendorf 729130ffaa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-10 21:27:20 -07:00
Brian Behlendorf ad2c91c5dc Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-10 21:27:04 -07:00
Brian Behlendorf e1a4d1e88a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-10 21:27:01 -07:00
Brian Behlendorf e610bf6e09 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-10 21:26:59 -07:00
Brian Behlendorf f019814c89 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-03-10 21:26:42 -07:00
Brian Behlendorf 4dc5121c0d Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-10 21:26:39 -07:00
Brian Behlendorf 28373d4a9c Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-03-10 21:26:29 -07:00
Brian Behlendorf d20eebca7e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-10 21:26:26 -07:00
Brian Behlendorf a409d66e44 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-10 21:26:17 -07:00
Brian Behlendorf 64c77b5cdb Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-10 21:26:14 -07:00
Brian Behlendorf 90f30ef088 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-10 21:26:04 -07:00
Brian Behlendorf fa1caa560d Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-10 21:26:01 -07:00
Brian Behlendorf b9181dc2a0 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-03-10 21:25:52 -07:00
Brian Behlendorf 8bf4b3eeda Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-10 21:25:48 -07:00
Brian Behlendorf dab1dabf17 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-03-10 21:25:39 -07:00
Brian Behlendorf f69ecb664b Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-03-10 21:25:36 -07:00
Brian Behlendorf 36860ec1a8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	module/Makefile.in
2009-03-10 21:23:17 -07:00
Brian Behlendorf 11bcfaa5ef Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-10 21:22:15 -07:00
Brian Behlendorf c8e569dd1c Build system and packaging (RPM support) (Part 2)
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:13:30 -07:00
Brian Behlendorf 8b1922e034 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-03-10 11:30:26 -07:00
Brian Behlendorf e69277d306 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-10 11:30:23 -07:00