Brian Behlendorf
|
31630287ca
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Conflicts:
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
|
2010-05-28 13:51:29 -07:00 |
|
Brian Behlendorf
|
ab1a68b225
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Conflicts:
module/zfs/dnode_sync.c
|
2010-05-28 13:46:45 -07:00 |
|
Brian Behlendorf
|
428870ff73
|
Update core ZFS code from build 121 to build 141.
|
2010-05-28 13:45:14 -07:00 |
|
Brian Behlendorf
|
bcfe72108d
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:13 -07:00 |
|
Brian Behlendorf
|
6807f4d1e5
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-28 12:46:12 -07:00 |
|
Brian Behlendorf
|
dce948dcc3
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:11 -07:00 |
|
Brian Behlendorf
|
edafb16564
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-28 12:46:10 -07:00 |
|
Brian Behlendorf
|
65334acb7d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-28 12:46:10 -07:00 |
|
Brian Behlendorf
|
dbe2da764f
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:07 -07:00 |
|
Brian Behlendorf
|
73bbb3ad55
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-28 12:46:06 -07:00 |
|
Brian Behlendorf
|
9c12fdf378
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:05 -07:00 |
|
Brian Behlendorf
|
82fd89630d
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-28 12:46:04 -07:00 |
|
Brian Behlendorf
|
87dc15d723
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-28 12:46:02 -07:00 |
|
Brian Behlendorf
|
6e34d7f2f0
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:02 -07:00 |
|
Brian Behlendorf
|
d1050a3a50
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-28 12:46:00 -07:00 |
|
Brian Behlendorf
|
d55a3f122c
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:00 -07:00 |
|
Brian Behlendorf
|
9f3a0bd60c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-05-28 12:45:58 -07:00 |
|
Brian Behlendorf
|
a9f9d3a478
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:58 -07:00 |
|
Brian Behlendorf
|
56cd97b016
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-05-28 12:45:56 -07:00 |
|
Brian Behlendorf
|
de41de444f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:56 -07:00 |
|
Brian Behlendorf
|
2a239668c2
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-05-28 12:45:54 -07:00 |
|
Brian Behlendorf
|
755c1dbfa9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:54 -07:00 |
|
Brian Behlendorf
|
716a5ec4e3
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-05-28 12:45:52 -07:00 |
|
Brian Behlendorf
|
e27688def4
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:52 -07:00 |
|
Brian Behlendorf
|
4a978b2b53
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-05-28 12:45:50 -07:00 |
|
Brian Behlendorf
|
87fd914ec4
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:50 -07:00 |
|
Brian Behlendorf
|
a059fe04d3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:48 -07:00 |
|
Brian Behlendorf
|
9031b3b799
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-05-28 12:45:47 -07:00 |
|
Brian Behlendorf
|
56f3a67fe2
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:46 -07:00 |
|
Brian Behlendorf
|
96855d7c66
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-28 12:45:45 -07:00 |
|
Brian Behlendorf
|
0dea6278a2
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-28 12:45:43 -07:00 |
|
Brian Behlendorf
|
cfdf415000
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:43 -07:00 |
|
Brian Behlendorf
|
05d780f5c6
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-28 12:45:41 -07:00 |
|
Brian Behlendorf
|
2c2cc18ae1
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-05-28 12:45:41 -07:00 |
|
Brian Behlendorf
|
3dc76b991d
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-05-28 12:45:41 -07:00 |
|
Brian Behlendorf
|
0ca93c1c67
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:41 -07:00 |
|
Brian Behlendorf
|
1d715125b6
|
Remove gcc-shadow from gcc-branch
|
2010-05-28 12:44:01 -07:00 |
|
Brian Behlendorf
|
de86e13755
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-28 12:43:04 -07:00 |
|
Brian Behlendorf
|
130c501938
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:43:04 -07:00 |
|
Brian Behlendorf
|
ea356d9855
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-28 12:43:02 -07:00 |
|
Brian Behlendorf
|
6dc18db9b1
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:43:02 -07:00 |
|
Brian Behlendorf
|
6324adf280
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-28 12:43:01 -07:00 |
|
Brian Behlendorf
|
812f695448
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:42:58 -07:00 |
|
Brian Behlendorf
|
885089decd
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-28 12:42:57 -07:00 |
|
Brian Behlendorf
|
79e7a65233
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-28 12:42:55 -07:00 |
|
Brian Behlendorf
|
e449a3758c
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:42:55 -07:00 |
|
Brian Behlendorf
|
b3dfaa8f73
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-28 12:42:53 -07:00 |
|
Brian Behlendorf
|
2b222b4fba
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:42:53 -07:00 |
|
Brian Behlendorf
|
b129779291
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-28 12:42:51 -07:00 |
|
Brian Behlendorf
|
c071b7b5b1
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:42:51 -07:00 |