b23468df87
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-27 16:22:13 -07:00
0fda53f6a0
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-27 16:22:03 -07:00
aa3b4e37ca
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-27 16:22:02 -07:00
3ea67ee905
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:52 -07:00
88f2b26c8f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-27 16:21:51 -07:00
568fa92fdb
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:42 -07:00
2407213cbd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-27 16:21:40 -07:00
6e2e45162c
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:31 -07:00
5005f5fbf6
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-27 16:21:30 -07:00
a08f4edee7
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:20 -07:00
98e40dfce7
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-27 16:21:19 -07:00
ea431b4dc6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 16:14:04 -07:00
319f69734b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-27 16:13:19 -07:00
390995db28
Revert all remaining changes.
2010-05-27 14:25:06 -07:00
63fce783d6
Readd feature-branch to get the last of the reversions
2010-05-27 14:23:51 -07:00
dd76d998df
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-27 14:20:57 -07:00
73154ba3a6
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 14:20:57 -07:00
fc38791259
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:57 -07:00
54d449addb
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:55 -07:00
67e486bd25
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-27 14:20:54 -07:00
05d095fb85
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 14:20:54 -07:00
b99220c31b
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-27 14:20:50 -07:00
b3d2bc68fe
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:50 -07:00
3a1216e9ae
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:48 -07:00
b6d6e47c54
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-27 14:20:47 -07:00
12d3bb0d0b
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-27 14:20:45 -07:00
4fac9a6ead
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:45 -07:00
826a1c08e8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 14:20:43 -07:00
26e5a5f826
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:43 -07:00
66672b2810
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-27 14:20:41 -07:00
c8391fcb64
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:41 -07:00
3f8590a9fc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 14:20:38 -07:00
31832fe1eb
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:38 -07:00
7cb88a7d2f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-27 14:20:36 -07:00
c1bedc8a16
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:36 -07:00
af9bf1fd70
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:34 -07:00
1961012286
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-27 14:20:33 -07:00
983616fff7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-27 14:20:31 -07:00
d744fd2e30
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:31 -07:00
b9f515b5a3
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-27 14:20:29 -07:00
f87fb9cad0
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:29 -07:00
9d199764e4
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:27 -07:00
079d4e640f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-27 14:20:26 -07:00
910bbffe5d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-27 14:20:24 -07:00
3f9bcb6df5
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:24 -07:00
79bd2d0703
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-27 14:20:22 -07:00
3913170928
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:22 -07:00
0e46276339
Remove feature-branch.
...
All but the pthreads changes have been committed upstream and in
the name of keeping the topgit tree as simple as possible I'm removing
the entire 'feature' subtree. The pthreads changes are now a 'fix'.
2010-05-27 14:17:51 -07:00
261142ee23
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-27 14:15:45 -07:00
94ec502e69
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 14:15:45 -07:00
Brian Behlendorf