Brian Behlendorf
568fa92fdb
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:42 -07:00
Brian Behlendorf
2407213cbd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-27 16:21:40 -07:00
Brian Behlendorf
6e2e45162c
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:31 -07:00
Brian Behlendorf
5005f5fbf6
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-27 16:21:30 -07:00
Brian Behlendorf
a08f4edee7
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:20 -07:00
Brian Behlendorf
98e40dfce7
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-27 16:21:19 -07:00
Brian Behlendorf
ea431b4dc6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 16:14:04 -07:00
Brian Behlendorf
319f69734b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-27 16:13:19 -07:00
Brian Behlendorf
390995db28
Revert all remaining changes.
2010-05-27 14:25:06 -07:00
Brian Behlendorf
63fce783d6
Readd feature-branch to get the last of the reversions
2010-05-27 14:23:51 -07:00
Brian Behlendorf
73154ba3a6
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 14:20:57 -07:00
Brian Behlendorf
fc38791259
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:57 -07:00
Brian Behlendorf
54d449addb
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:55 -07:00
Brian Behlendorf
67e486bd25
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-27 14:20:54 -07:00
Brian Behlendorf
05d095fb85
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 14:20:54 -07:00
Brian Behlendorf
b99220c31b
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-27 14:20:50 -07:00
Brian Behlendorf
b3d2bc68fe
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:50 -07:00
Brian Behlendorf
3a1216e9ae
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:48 -07:00
Brian Behlendorf
b6d6e47c54
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-27 14:20:47 -07:00
Brian Behlendorf
12d3bb0d0b
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-27 14:20:45 -07:00
Brian Behlendorf
4fac9a6ead
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:45 -07:00
Brian Behlendorf
826a1c08e8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 14:20:43 -07:00
Brian Behlendorf
26e5a5f826
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:43 -07:00
Brian Behlendorf
66672b2810
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-27 14:20:41 -07:00
Brian Behlendorf
c8391fcb64
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:41 -07:00
Brian Behlendorf
3f8590a9fc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 14:20:38 -07:00
Brian Behlendorf
31832fe1eb
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:38 -07:00
Brian Behlendorf
7cb88a7d2f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-27 14:20:36 -07:00
Brian Behlendorf
c1bedc8a16
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:36 -07:00
Brian Behlendorf
af9bf1fd70
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:34 -07:00
Brian Behlendorf
1961012286
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-27 14:20:33 -07:00
Brian Behlendorf
983616fff7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-27 14:20:31 -07:00
Brian Behlendorf
d744fd2e30
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:31 -07:00
Brian Behlendorf
b9f515b5a3
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-27 14:20:29 -07:00
Brian Behlendorf
f87fb9cad0
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:29 -07:00
Brian Behlendorf
9d199764e4
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:27 -07:00
Brian Behlendorf
079d4e640f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-27 14:20:26 -07:00
Brian Behlendorf
910bbffe5d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-27 14:20:24 -07:00
Brian Behlendorf
3f9bcb6df5
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:24 -07:00
Brian Behlendorf
79bd2d0703
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-27 14:20:22 -07:00
Brian Behlendorf
3913170928
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 14:20:22 -07:00
Brian Behlendorf
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
Brian Behlendorf
94ec502e69
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 14:15:45 -07:00
Brian Behlendorf
2f1a9c3fa5
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:45 -07:00
Brian Behlendorf
c73c292773
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:43 -07:00
Brian Behlendorf
eb3036541f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-27 14:15:42 -07:00
Brian Behlendorf
ae4b1b469c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 14:15:42 -07:00
Brian Behlendorf
f2d0cefacc
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-27 14:15:38 -07:00
Brian Behlendorf
b469c46601
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:38 -07:00
Brian Behlendorf
f0c3684660
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-27 14:15:35 -07:00