Commit Graph

13892 Commits

Author SHA1 Message Date
Brian Behlendorf a851d03f90 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-10 11:53:48 -07:00
Brian Behlendorf 2a3accd18e Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-10 11:53:38 -07:00
Brian Behlendorf 302375657e Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-10 11:53:35 -07:00
Brian Behlendorf 63ab25ce2d Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-10 11:53:24 -07:00
Brian Behlendorf 60f6986949 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-10 11:53:21 -07:00
Brian Behlendorf 422c410f42 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-10 11:53:11 -07:00
Brian Behlendorf 36e68f7a77 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-10 11:53:08 -07:00
Brian Behlendorf ba48dae5b3 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-10 11:52:58 -07:00
Brian Behlendorf 379941cb58 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-10 11:52:55 -07:00
Brian Behlendorf 69cf90c73c Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-10 11:52:43 -07:00
Brian Behlendorf e193cf8fe9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-10 11:52:39 -07:00
Brian Behlendorf 2ff4d2c67d Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-10 11:52:28 -07:00
Brian Behlendorf e3b978871c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-10 11:52:25 -07:00
Brian Behlendorf a7cf190668 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-10 11:52:15 -07:00
Brian Behlendorf a3efe824b0 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-10 11:52:11 -07:00
Brian Behlendorf 2cd460a77c Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-10 11:52:01 -07:00
Brian Behlendorf 7cbeb850aa Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-10 11:51:55 -07:00
Brian Behlendorf ef8ea87453 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-10 11:51:45 -07:00
Brian Behlendorf 850c1be22f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-10 11:51:42 -07:00
Brian Behlendorf 0d53adee40 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-10 11:51:32 -07:00
Brian Behlendorf c5271def96 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-10 11:51:29 -07:00
Brian Behlendorf 62806e60d6 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-10 11:51:14 -07:00
Brian Behlendorf 91fcf9d661 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-10 11:51:11 -07:00
Brian Behlendorf 9ffbe8f428 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-10 11:51:09 -07:00
Brian Behlendorf d3cb195b31 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-10 11:50:50 -07:00
Brian Behlendorf b46157da8c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-10 11:50:46 -07:00
Brian Behlendorf 97b7f6157a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-10 11:50:44 -07:00
Brian Behlendorf 87afeb0c9f Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-10 11:50:25 -07:00
Brian Behlendorf fee013410b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-10 11:50:22 -07:00
Brian Behlendorf f703cdc71e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-10 11:50:12 -07:00
Brian Behlendorf 94d5d7c326 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-10 11:50:09 -07:00
Brian Behlendorf 967d989218 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-10 11:49:58 -07:00
Brian Behlendorf f9a1be5777 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-10 11:49:55 -07:00
Brian Behlendorf e1509f3193 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-10 11:49:45 -07:00
Brian Behlendorf 540cecf05b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-10 11:49:41 -07:00
Brian Behlendorf e0da613c8a Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-10 11:49:26 -07:00
Brian Behlendorf 28a685cc08 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-10 11:49:23 -07:00
Brian Behlendorf 2f292469d4 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-10 11:49:13 -07:00
Brian Behlendorf 35e2458a84 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-10 11:49:09 -07:00
Brian Behlendorf dd51c10883 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-10 11:48:59 -07:00
Brian Behlendorf d30bd90861 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-10 11:48:56 -07:00
Brian Behlendorf 8a5b47ebb5 Add dmu_write_impl() prototype needed by zpios until a clean
zerocopy interface is available.
2009-07-10 11:39:37 -07:00
Brian Behlendorf 8bb9b8305a Export new quota related symbols. 2009-07-10 11:38:53 -07:00
Brian Behlendorf e16ffab302 SPLBUILD now includes modules 2009-07-10 11:37:30 -07:00
Brian Behlendorf 25d1daae9e Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-10 10:55:35 -07:00
Brian Behlendorf 5f9803ee22 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-10 10:55:30 -07:00
Brian Behlendorf ca6b43cce4 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-10 10:55:20 -07:00
Brian Behlendorf 235fe70604 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-10 10:55:17 -07:00
Brian Behlendorf 33eec3513e Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-10 10:55:07 -07:00
Brian Behlendorf 452ebd84b7 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-10 10:55:04 -07:00