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
94ec502e69
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 14:15:45 -07:00
2f1a9c3fa5
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:45 -07:00
c73c292773
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:43 -07:00
eb3036541f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-27 14:15:42 -07:00
ae4b1b469c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 14:15:42 -07:00
f2d0cefacc
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-27 14:15:38 -07:00
b469c46601
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:38 -07:00
f0c3684660
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-27 14:15:35 -07:00
41ad9a58f0
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:35 -07:00
c7db7f2455
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-27 14:15:33 -07:00
1c4b78bbeb
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:33 -07:00
96be644432
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:31 -07:00
197f1c09b8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 14:15:30 -07:00
f6b100d96a
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-27 14:15:28 -07:00
300453dead
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:28 -07:00
5c3846ba29
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:26 -07:00
d56dd05097
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 14:15:25 -07:00
3ce33d954e
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-27 14:15:23 -07:00
38e40e139d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:23 -07:00
fa5c2f818b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:21 -07:00
6bc8f58aad
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-27 14:15:20 -07:00
4421661601
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-27 14:15:18 -07:00
52d792504e
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:18 -07:00
f6e5d45b0c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:16 -07:00
ac923554d2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-27 14:15:15 -07:00
db5e306c22
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-27 14:15:13 -07:00
c246f18387
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:13 -07:00
02843c25c5
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:11 -07:00
01b8f42635
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-27 14:15:10 -07:00
b265da19f0
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 14:15:08 -07:00
9e960226cd
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-27 14:15:08 -07:00
3a7896c8d2
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 14:15:08 -07:00
aabc970314
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:08 -07:00
c7742fd698
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-27 14:15:07 -07:00
5c16b9898b
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-05-27 14:15:07 -07:00
b754295dec
Revert feature-zap-cursor-to-key feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 14:12:59 -07:00
Brian Behlendorf