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
|
b7a979da7b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 16:09:38 -08:00 |
|
Brian Behlendorf
|
7346be688e
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-12 16:09:35 -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
|
9bc5ab5651
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:58:10 -08:00 |
|
Brian Behlendorf
|
656a3db170
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-12 15:58:08 -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
|
15218256e4
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:37:44 -08:00 |
|
Brian Behlendorf
|
5134bd533c
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-12 15:36:18 -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
|
0bff1d6d3b
|
New TopGit dependency: linux-context
|
2008-12-12 15:35:40 -08:00 |
|
Brian Behlendorf
|
ac35c9f782
|
Minor verify tweak
|
2008-12-12 15:35:12 -08:00 |
|
Brian Behlendorf
|
ef88744480
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:28:33 -08:00 |
|
Brian Behlendorf
|
842a9e0fae
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-12 15:28:32 -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
|
a64c093aae
|
Refresh autogen products
|
2008-12-12 15:18:52 -08:00 |
|
Brian Behlendorf
|
f3e6ac6dc9
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:09:00 -08:00 |
|
Brian Behlendorf
|
6179805cfe
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-12 15:08:57 -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 |
|
Brian Behlendorf
|
94b71f0bf3
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:34 -08:00 |
|
Brian Behlendorf
|
faf6c753bd
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 15:07:33 -08:00 |
|
Brian Behlendorf
|
cd3ba16270
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:30 -08:00 |
|
Brian Behlendorf
|
f6421585ad
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 15:07:29 -08:00 |
|
Brian Behlendorf
|
3219e6f05c
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:26 -08:00 |
|
Brian Behlendorf
|
a74ec0ff24
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 15:07:24 -08:00 |
|
Brian Behlendorf
|
d63a31165a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:21 -08:00 |