Brian Behlendorf
|
aabc970314
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-05-27 14:15:08 -07:00 |
|
Brian Behlendorf
|
c7742fd698
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-05-27 14:15:07 -07:00 |
|
Brian Behlendorf
|
5c16b9898b
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2010-05-27 14:15:07 -07:00 |
|
Brian Behlendorf
|
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
|
621bdaee6e
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-27 13:57:54 -07:00 |
|
Brian Behlendorf
|
ac056180d6
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:54 -07:00 |
|
Brian Behlendorf
|
875644a6d1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-27 13:57:51 -07:00 |
|
Brian Behlendorf
|
2a6cd5602b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-27 13:57:51 -07:00 |
|
Brian Behlendorf
|
a094122233
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:51 -07:00 |
|
Brian Behlendorf
|
96b6c39456
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-27 13:57:46 -07:00 |
|
Brian Behlendorf
|
6af473bf1b
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:46 -07:00 |
|
Brian Behlendorf
|
46eeb51e56
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-27 13:57:44 -07:00 |
|
Brian Behlendorf
|
e2ee695578
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:44 -07:00 |
|
Brian Behlendorf
|
4b3e539f66
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:42 -07:00 |
|
Brian Behlendorf
|
431d65d75e
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-27 13:57:41 -07:00 |
|
Brian Behlendorf
|
56208c0dbe
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-27 13:57:39 -07:00 |
|
Brian Behlendorf
|
40e0ef8c4b
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:39 -07:00 |
|
Brian Behlendorf
|
6d7c0f2950
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:37 -07:00 |
|
Brian Behlendorf
|
fb95d3eb74
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-05-27 13:57:36 -07:00 |
|
Brian Behlendorf
|
16453f7a3f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-05-27 13:57:34 -07:00 |
|
Brian Behlendorf
|
25791f9e2c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:34 -07:00 |
|
Brian Behlendorf
|
8471e2e9a0
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:32 -07:00 |
|
Brian Behlendorf
|
f94301fba5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-05-27 13:57:31 -07:00 |
|
Brian Behlendorf
|
f1c228cb78
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-05-27 13:57:29 -07:00 |
|
Brian Behlendorf
|
7edee5bacc
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:29 -07:00 |
|
Brian Behlendorf
|
d16d31dd39
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:27 -07:00 |
|
Brian Behlendorf
|
38f5286432
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-05-27 13:57:26 -07:00 |
|
Brian Behlendorf
|
ea9a828903
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-05-27 13:57:24 -07:00 |
|
Brian Behlendorf
|
0120d2d7c8
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:24 -07:00 |
|
Brian Behlendorf
|
cd2e824900
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-27 13:57:21 -07:00 |
|
Brian Behlendorf
|
35db44331c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:21 -07:00 |
|
Brian Behlendorf
|
07911c887e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-27 13:57:19 -07:00 |
|
Brian Behlendorf
|
28da18c724
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:19 -07:00 |
|
Brian Behlendorf
|
249ae381e1
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 13:57:16 -07:00 |
|
Brian Behlendorf
|
64e23a4c7a
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-27 13:57:16 -07:00 |
|
Brian Behlendorf
|
59104b4325
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-05-27 13:57:16 -07:00 |
|
Brian Behlendorf
|
d2e83956de
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:57:16 -07:00 |
|
Brian Behlendorf
|
262c747b4c
|
Remove feature-pthreads topic branch
|
2010-05-27 13:54:07 -07:00 |
|
Brian Behlendorf
|
9e8bb2aae4
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-27 13:53:15 -07:00 |
|
Brian Behlendorf
|
d86abf3c29
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:53:15 -07:00 |
|
Brian Behlendorf
|
8605817009
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-27 13:53:12 -07:00 |
|
Brian Behlendorf
|
84633aa1a1
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:53:12 -07:00 |
|
Brian Behlendorf
|
0ee82dae98
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
module/zfs/dmu_tx.c
|
2010-05-27 13:53:07 -07:00 |
|
Brian Behlendorf
|
7b4446a766
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:52:10 -07:00 |
|
Brian Behlendorf
|
fd3ff8f53e
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-27 13:52:09 -07:00 |
|
Brian Behlendorf
|
1c2ab6981b
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-27 13:52:07 -07:00 |
|
Brian Behlendorf
|
a1b6f08cd8
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:52:07 -07:00 |
|
Brian Behlendorf
|
11a2b545a1
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-27 13:52:04 -07:00 |
|
Brian Behlendorf
|
b783864dab
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:52:04 -07:00 |
|
Brian Behlendorf
|
64c35deecd
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-27 13:52:02 -07:00 |