Brian Behlendorf
|
7f33364d3c
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
|
2009-03-19 21:03:58 -07:00 |
|
Brian Behlendorf
|
1d058bcfd4
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-19 20:59:35 -07:00 |
|
Brian Behlendorf
|
e7f02d3b41
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-19 20:59:33 -07:00 |
|
Brian Behlendorf
|
eb811f7fa9
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
|
2009-03-19 20:59:12 -07:00 |
|
Brian Behlendorf
|
a71161249a
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-03-19 20:57:53 -07:00 |
|
Brian Behlendorf
|
c89153393f
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-03-19 20:51:18 -07:00 |
|
Brian Behlendorf
|
f180959bac
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-03-19 20:51:18 -07:00 |
|
Brian Behlendorf
|
a32dc3b04b
|
New TopGit dependency: feature-pthreads
|
2009-03-19 20:51:17 -07:00 |
|
Brian Behlendorf
|
54b5b41a58
|
Add 'feature-pthreads' branch to features branch.
|
2009-03-19 20:49:52 -07:00 |
|
Brian Behlendorf
|
29703a5b4e
|
Add 'feature-commit-cb' branch for DMU commit callbacks.
|
2009-03-19 20:30:14 -07:00 |
|
Brian Behlendorf
|
182e9e0973
|
Remove 'fix-pthreads' dependency from 'fix-branch'
|
2009-03-19 19:59:10 -07:00 |
|
Brian Behlendorf
|
54320d4bb4
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:58:42 -07:00 |
|
Brian Behlendorf
|
82c7af8987
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-19 19:58:40 -07:00 |
|
Brian Behlendorf
|
4f21094709
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:58:31 -07:00 |
|
Brian Behlendorf
|
7a87dfebb8
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-19 19:58:30 -07:00 |
|
Brian Behlendorf
|
6e68618f50
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:58:21 -07:00 |
|
Brian Behlendorf
|
2ddd5986e0
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
Conflicts:
lib/libzpool/include/sys/zfs_context.h
|
2009-03-19 19:58:12 -07:00 |
|
Brian Behlendorf
|
8acc54298e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:57:37 -07:00 |
|
Brian Behlendorf
|
6af4495583
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-19 19:57:36 -07:00 |
|
Brian Behlendorf
|
4863aa789f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:57:27 -07:00 |
|
Brian Behlendorf
|
d9fd92c850
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-19 19:57:26 -07:00 |
|
Brian Behlendorf
|
1cd6368e18
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:57:17 -07:00 |
|
Brian Behlendorf
|
240445807b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-19 19:57:13 -07:00 |
|
Brian Behlendorf
|
90e2a43339
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:57:05 -07:00 |
|
Brian Behlendorf
|
ed846ea072
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-19 19:57:03 -07:00 |
|
Brian Behlendorf
|
4386275aab
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:56:54 -07:00 |
|
Brian Behlendorf
|
d92b55464e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-19 19:56:53 -07:00 |
|
Brian Behlendorf
|
2150fdce7c
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:56:44 -07:00 |
|
Brian Behlendorf
|
0c74c762fb
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-19 19:56:42 -07:00 |
|
Brian Behlendorf
|
aa5e0b3f80
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:56:34 -07:00 |
|
Brian Behlendorf
|
df1b7871e5
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-19 19:56:30 -07:00 |
|
Brian Behlendorf
|
b2ed9f85f6
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:56:21 -07:00 |
|
Brian Behlendorf
|
76022f22f7
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-19 19:56:19 -07:00 |
|
Brian Behlendorf
|
7ffd09378f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:56:11 -07:00 |
|
Brian Behlendorf
|
37a1ac2093
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-19 19:56:09 -07:00 |
|
Brian Behlendorf
|
d8e81db97b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-19 19:56:08 -07:00 |
|
Brian Behlendorf
|
8c8ffef072
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:55:52 -07:00 |
|
Brian Behlendorf
|
8424aa956f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-19 19:55:50 -07:00 |
|
Brian Behlendorf
|
dabea57f25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-19 19:55:49 -07:00 |
|
Brian Behlendorf
|
bb9500e314
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:55:32 -07:00 |
|
Brian Behlendorf
|
8f9ea9a42c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-19 19:55:31 -07:00 |
|
Brian Behlendorf
|
d8e299f871
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:55:22 -07:00 |
|
Brian Behlendorf
|
bc33bac9c3
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-19 19:55:21 -07:00 |
|
Brian Behlendorf
|
a349e0b0b1
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:55:12 -07:00 |
|
Brian Behlendorf
|
bd2293fdb1
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-19 19:55:03 -07:00 |
|
Brian Behlendorf
|
dd54a4a177
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:54:54 -07:00 |
|
Brian Behlendorf
|
1d2e8df03f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-19 19:54:53 -07:00 |
|
Brian Behlendorf
|
4280da108d
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:54:44 -07:00 |
|
Brian Behlendorf
|
7bf5103553
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-19 19:54:43 -07:00 |
|
Brian Behlendorf
|
d9f4c517f9
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-19 19:54:34 -07:00 |