Commit Graph

13814 Commits

Author SHA1 Message Date
Brian Behlendorf 9631238815 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-08 15:01:57 -07:00
Brian Behlendorf ed0963b770 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-08 15:01:54 -07:00
Brian Behlendorf 7c714d20aa Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-08 15:01:43 -07:00
Brian Behlendorf 28dcf07ed5 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-08 15:01:40 -07:00
Brian Behlendorf fd0580a2a5 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-08 15:01:29 -07:00
Brian Behlendorf 9d0a9d87d6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-08 15:01:26 -07:00
Brian Behlendorf b252e8f250 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-08 15:01:16 -07:00
Brian Behlendorf bfefda4fc1 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-08 15:01:12 -07:00
Brian Behlendorf 34d9a216f2 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-08 15:01:02 -07:00
Brian Behlendorf 479d7d14d0 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-08 15:00:58 -07:00
Brian Behlendorf c821af8f89 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-08 15:00:48 -07:00
Brian Behlendorf d596011acd Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-08 15:00:45 -07:00
Brian Behlendorf 058a25a017 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 15:00:43 -07:00
Brian Behlendorf 275d66171b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-08 15:00:41 -07:00
Brian Behlendorf 151315f7cb Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-07-08 15:00:40 -07:00
Brian Behlendorf fa35bfd3cf Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-07-08 15:00:39 -07:00
Brian Behlendorf 57ae3b59e9 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-07-08 15:00:39 -07:00
Brian Behlendorf 2caba8e240 Add new DMU_READ_PREFETCH flag to dmu_read(). 2009-07-08 14:51:55 -07:00
Brian Behlendorf 1ab1b8502b Stop the kthread/thread/pthread mixing and matching insanity. Update all
code to only use the kthread API regardless of if it is compiled in the
kernel or user space.  The kthread API will be layered on top of pthreads
as best as possible in zfs_context, this is non optimal but much clearer.
2009-07-08 14:47:23 -07:00
Brian Behlendorf 4ad10013d6 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-08 09:21:08 -07:00
Brian Behlendorf edea9ae6a7 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-08 09:21:05 -07:00
Brian Behlendorf 38feca0ba1 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-08 09:20:55 -07:00
Brian Behlendorf b5c5838d48 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-08 09:20:50 -07:00
Brian Behlendorf 2d327f3275 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-08 09:20:41 -07:00
Brian Behlendorf b12e8eb702 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-08 09:20:37 -07:00
Brian Behlendorf 693fa574b2 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-08 09:20:26 -07:00
Brian Behlendorf 847d709b91 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-08 09:20:24 -07:00
Brian Behlendorf 89449f57f6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-08 09:20:14 -07:00
Brian Behlendorf a1ff07a5f9 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-08 09:20:11 -07:00
Brian Behlendorf 001fc2df76 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-08 09:20:00 -07:00
Brian Behlendorf cfa46b4440 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-08 09:19:57 -07:00
Brian Behlendorf 88674c2258 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-08 09:19:47 -07:00
Brian Behlendorf 78b1d31076 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-08 09:19:44 -07:00
Brian Behlendorf fa6a5d9e82 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-08 09:19:34 -07:00
Brian Behlendorf 0242cb33fe Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-08 09:19:31 -07:00
Brian Behlendorf ee56fcdc7e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-08 09:19:19 -07:00
Brian Behlendorf e5843486bd Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-08 09:19:16 -07:00
Brian Behlendorf 5f2300272e Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-08 09:19:06 -07:00
Brian Behlendorf 1ef0da1c7b Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-08 09:19:03 -07:00
Brian Behlendorf 06e75376b9 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-08 09:18:50 -07:00
Brian Behlendorf 6e1c4e5bd6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-08 09:18:45 -07:00
Brian Behlendorf e37dd8d947 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-08 09:18:35 -07:00
Brian Behlendorf e2e3b40ef9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-08 09:18:32 -07:00
Brian Behlendorf 6ab57ac816 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-08 09:18:22 -07:00
Brian Behlendorf 0d73002d8d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-08 09:18:20 -07:00
Brian Behlendorf 1e0e588128 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-08 09:18:18 -07:00
Brian Behlendorf 57c5639642 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-08 09:17:56 -07:00
Brian Behlendorf 2aa22c1ccb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-08 09:17:53 -07:00
Brian Behlendorf 1355255010 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 09:17:52 -07:00
Brian Behlendorf 169529da97 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-08 09:17:31 -07:00