Brian Behlendorf
60f6dbae00
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-08 15:05:07 -07:00
Brian Behlendorf
90b4752aa3
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-08 15:05:04 -07:00
Brian Behlendorf
8dc3520832
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-08 15:04:54 -07:00
Brian Behlendorf
fd94a958ff
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-08 15:04:51 -07:00
Brian Behlendorf
3864eb6574
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-08 15:04:40 -07:00
Brian Behlendorf
5cbd98db73
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-08 15:04:37 -07:00
Brian Behlendorf
4721e38e7c
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-08 15:04:26 -07:00
Brian Behlendorf
133f5a2bdd
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-08 15:04:23 -07:00
Brian Behlendorf
a9634c4a3d
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-08 15:04:12 -07:00
Brian Behlendorf
f2f1efacf8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-08 15:04:09 -07:00
Brian Behlendorf
af7bb2cb32
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-08 15:03:59 -07:00
Brian Behlendorf
c764685bff
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-08 15:03:54 -07:00
Brian Behlendorf
ea7836ef92
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-08 15:03:44 -07:00
Brian Behlendorf
c077c7dda7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-08 15:03:40 -07:00
Brian Behlendorf
91bbc6b515
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-08 15:03:30 -07:00
Brian Behlendorf
fc9b3350aa
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-08 15:03:25 -07:00
Brian Behlendorf
fc5c841b6e
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-08 15:03:15 -07:00
Brian Behlendorf
47701d2c24
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-08 15:03:11 -07:00
Brian Behlendorf
77da84618a
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-08 15:03:00 -07:00
Brian Behlendorf
4103d86faa
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-08 15:02:57 -07:00
Brian Behlendorf
4ba38f1259
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-08 15:02:56 -07:00
Brian Behlendorf
bb59101179
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-08 15:02:36 -07:00
Brian Behlendorf
be5ff6fcdd
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-08 15:02:33 -07:00
Brian Behlendorf
d95ee13c20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-08 15:02:31 -07:00
Brian Behlendorf
8dfbebfdd6
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-08 15:02:13 -07:00
Brian Behlendorf
acad4b45c1
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-08 15:02:08 -07:00
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