Brian Behlendorf
|
93e36c1f27
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:01:22 -08:00 |
|
Brian Behlendorf
|
53e66eef5a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 17:01:14 -08:00 |
|
Brian Behlendorf
|
6e26929ddf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 17:01:12 -08:00 |
|
Brian Behlendorf
|
420137d529
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 17:01:09 -08:00 |
|
Brian Behlendorf
|
194244b80b
|
Resolve read shadow conflict
|
2008-12-17 16:57:21 -08:00 |
|
Brian Behlendorf
|
62568c369a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:10:42 -08:00 |
|
Brian Behlendorf
|
07411c1f84
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 13:10:39 -08:00 |
|
Brian Behlendorf
|
6ab9c098f1
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 13:10:39 -08:00 |
|
Brian Behlendorf
|
9842c708fa
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 13:10:38 -08:00 |
|
Brian Behlendorf
|
1e3aeaaef1
|
Resolve shadow conflict
|
2008-12-17 13:08:39 -08:00 |
|
Brian Behlendorf
|
b62245fc80
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:04:00 -08:00 |
|
Brian Behlendorf
|
b5740d86cf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 13:03:57 -08:00 |
|
Brian Behlendorf
|
b9fe30002e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 13:03:57 -08:00 |
|
Brian Behlendorf
|
e41d37c49d
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 13:03:56 -08:00 |
|
Brian Behlendorf
|
fafeacb53f
|
Resolve shadow conflict
|
2008-12-17 13:01:56 -08:00 |
|
Brian Behlendorf
|
52d8216e19
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:48:15 -08:00 |
|
Brian Behlendorf
|
f802338b3c
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 12:48:12 -08:00 |
|
Brian Behlendorf
|
1153d7e9da
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:45:58 -08:00 |
|
Brian Behlendorf
|
863ec76ff7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 12:45:53 -08:00 |
|
Brian Behlendorf
|
941e464645
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 12:45:52 -08:00 |
|
Brian Behlendorf
|
a1b865abee
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 12:45:51 -08:00 |
|
Brian Behlendorf
|
da718dd80a
|
Resolve shadow conflict
|
2008-12-17 12:42:17 -08:00 |
|
Brian Behlendorf
|
1a50fc5480
|
Resolve collision
|
2008-12-17 12:40:17 -08:00 |
|
Brian Behlendorf
|
8cfc6c6ef3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 12:29:38 -08:00 |
|
Brian Behlendorf
|
9129b436bb
|
Resolve conflict
|
2008-12-17 12:24:50 -08:00 |
|
Brian Behlendorf
|
5fa2d90840
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 12:23:59 -08:00 |
|
Brian Behlendorf
|
9ef6211ce7
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 12:23:57 -08:00 |
|
Brian Behlendorf
|
e2a977c404
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-17 12:23:55 -08:00 |
|
Brian Behlendorf
|
b23299c7db
|
Fix two prototypes in the right place
|
2008-12-17 12:20:20 -08:00 |
|
Brian Behlendorf
|
27ce147510
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 12:16:59 -08:00 |
|
Brian Behlendorf
|
126e1d5d92
|
Resolve conflict
|
2008-12-17 11:51:43 -08:00 |
|
Brian Behlendorf
|
385d51ad69
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:50:42 -08:00 |
|
Brian Behlendorf
|
6a509b3bca
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:50:41 -08:00 |
|
Brian Behlendorf
|
3719c4146d
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-17 11:50:40 -08:00 |
|
Brian Behlendorf
|
77811f8236
|
Fix prototype
|
2008-12-17 11:48:40 -08:00 |
|
Brian Behlendorf
|
4ee4891d66
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:10:16 -08:00 |
|
Brian Behlendorf
|
862436f8c9
|
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
|
2008-12-16 16:06:24 -08:00 |
|
Brian Behlendorf
|
305c3fc652
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:53:09 -08:00 |
|
Brian Behlendorf
|
313c01433d
|
Remove add zfs_i18n dependency
|
2008-12-12 16:41:22 -08:00 |
|
Brian Behlendorf
|
fe0cad8ba9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:59:38 -08:00 |
|
Brian Behlendorf
|
bc1ce928f6
|
Add makefiles
|
2008-12-12 08:57:54 -08:00 |
|
Brian Behlendorf
|
b62b4773d1
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:28:31 -08:00 |
|
Brian Behlendorf
|
a2d1d32c17
|
move vdev_disk to it's new home
|
2008-12-11 15:26:36 -08:00 |
|
Brian Behlendorf
|
cdc7d2613e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:24:07 -08:00 |
|
Brian Behlendorf
|
444d9f20c3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 15:24:05 -08:00 |
|
Brian Behlendorf
|
6cc6f50a02
|
Move to new home
|
2008-12-11 15:21:20 -08:00 |
|
Brian Behlendorf
|
f5290f405c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:19:18 -08:00 |
|
Brian Behlendorf
|
fc5f5929e7
|
move zpios to the correct dirs
|
2008-12-11 15:17:33 -08:00 |
|
Brian Behlendorf
|
2c028659ab
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 15:00:19 -08:00 |
|
Brian Behlendorf
|
477a85d905
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 15:00:01 -08:00 |