Brian Behlendorf
|
bc2a0d3aac
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 16:28:18 -08:00 |
|
Brian Behlendorf
|
7cfed3eaf8
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:10 -08:00 |
|
Brian Behlendorf
|
dbd7482662
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 16:28:07 -08:00 |
|
Brian Behlendorf
|
3e02e3c1a0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:01 -08:00 |
|
Brian Behlendorf
|
11a076447a
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 16:27:59 -08:00 |
|
Brian Behlendorf
|
3efb1a78a3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 16:27:57 -08:00 |
|
Brian Behlendorf
|
40df14f751
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:27:46 -08:00 |
|
Brian Behlendorf
|
1264e75515
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 16:27:43 -08:00 |
|
Brian Behlendorf
|
23302f57aa
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 16:27:40 -08:00 |
|
Brian Behlendorf
|
43add6640f
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:27:28 -08:00 |
|
Brian Behlendorf
|
ef933abd6e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 16:27:25 -08:00 |
|
Brian Behlendorf
|
4a229ca97e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:27:18 -08:00 |
|
Brian Behlendorf
|
1c238b277d
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 16:27:15 -08:00 |
|
Brian Behlendorf
|
1e622cb704
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:27:08 -08:00 |
|
Brian Behlendorf
|
f73fee417e
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 16:27:04 -08:00 |
|
Brian Behlendorf
|
e8f1b7b121
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:26:57 -08:00 |
|
Brian Behlendorf
|
5422135bc5
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 16:26:53 -08:00 |
|
Brian Behlendorf
|
d854d7174c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:26:47 -08:00 |
|
Brian Behlendorf
|
79dce443c0
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 16:26:44 -08:00 |
|
Brian Behlendorf
|
0398a2be2c
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:26:38 -08:00 |
|
Brian Behlendorf
|
74be67a629
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 16:26:34 -08:00 |
|
Brian Behlendorf
|
416157170a
|
Resolve conflict
|
2008-12-12 16:25:01 -08:00 |
|
Brian Behlendorf
|
01815c89a3
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 16:23:14 -08:00 |
|
Brian Behlendorf
|
0e8ac26fc9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 16:23:07 -08:00 |
|
Brian Behlendorf
|
08a8860091
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-12 16:23:04 -08:00 |
|
Brian Behlendorf
|
acfdfe6ed7
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-12 16:23:01 -08:00 |
|
Brian Behlendorf
|
eee73dd80e
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-12 16:22:59 -08:00 |
|
Brian Behlendorf
|
d0c573f27e
|
Add in the reset of the pthread changes
|
2008-12-12 16:16:06 -08:00 |
|
Brian Behlendorf
|
c264712b93
|
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:09:33 -08:00 |
|
Brian Behlendorf
|
d07c7914a0
|
Refresh context for assert
|
2008-12-12 16:02:48 -08:00 |
|
Brian Behlendorf
|
6c859b40d7
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:58:07 -08:00 |
|
Brian Behlendorf
|
0c575736b6
|
Make this primatives conditional to not conflict with context
|
2008-12-12 15:56:06 -08:00 |
|
Brian Behlendorf
|
b978916b98
|
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:36:18 -08:00 |
|
Brian Behlendorf
|
ac35c9f782
|
Minor verify tweak
|
2008-12-12 15:35:12 -08:00 |
|
Brian Behlendorf
|
7b363155b3
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:28:31 -08:00 |
|
Brian Behlendorf
|
5b4fa8eb54
|
Revert libzfs hunk
|
2008-12-12 15:26:39 -08:00 |
|
Brian Behlendorf
|
5a8bc093fd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:08:55 -08:00 |
|
Brian Behlendorf
|
a7b2b73c73
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 15:08:54 -08:00 |
|
Brian Behlendorf
|
9a8aac6ed3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:08:45 -08:00 |
|
Brian Behlendorf
|
03695a34c6
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 15:08:43 -08:00 |
|
Brian Behlendorf
|
2a88ad81de
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:08:34 -08:00 |
|
Brian Behlendorf
|
6263035e10
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 15:08:32 -08:00 |
|
Brian Behlendorf
|
62d487998b
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:08:15 -08:00 |
|
Brian Behlendorf
|
f04a16b1e3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 15:08:13 -08:00 |
|
Brian Behlendorf
|
be0d7c2855
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:54 -08:00 |
|
Brian Behlendorf
|
be0091aa60
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 15:07:50 -08:00 |
|
Brian Behlendorf
|
5f1f271665
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:44 -08:00 |
|
Brian Behlendorf
|
e7186e1790
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 15:07:42 -08:00 |
|
Brian Behlendorf
|
2d5f580b54
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:39 -08:00 |
|
Brian Behlendorf
|
c28d08a363
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 15:07:38 -08:00 |