Brian Behlendorf
|
379239a232
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-16 16:22:06 -08:00 |
|
Brian Behlendorf
|
35f6102b83
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:22:00 -08:00 |
|
Brian Behlendorf
|
f4b3b4ea9c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-16 16:21:58 -08:00 |
|
Brian Behlendorf
|
25893ff6fd
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:21:52 -08:00 |
|
Brian Behlendorf
|
55396e2849
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-16 16:21:49 -08:00 |
|
Brian Behlendorf
|
1e59da6452
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:21:43 -08:00 |
|
Brian Behlendorf
|
974879e427
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-16 16:21:41 -08:00 |
|
Brian Behlendorf
|
036c6c4657
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:21:35 -08:00 |
|
Brian Behlendorf
|
015fcbe3b2
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 16:21:32 -08:00 |
|
Brian Behlendorf
|
ad85b7f9a2
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:21:28 -08:00 |
|
Brian Behlendorf
|
5477876bdb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 16:21:25 -08:00 |
|
Brian Behlendorf
|
61c3ae8432
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:21:19 -08:00 |
|
Brian Behlendorf
|
a56dee01f5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 16:21:17 -08:00 |
|
Brian Behlendorf
|
4eb3c60440
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:21:11 -08:00 |
|
Brian Behlendorf
|
c5bd814f28
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 16:21:08 -08:00 |
|
Brian Behlendorf
|
009962fe95
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 16:21:07 -08:00 |
|
Brian Behlendorf
|
cf6328982e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:20:57 -08:00 |
|
Brian Behlendorf
|
e755184c42
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-16 16:20:55 -08:00 |
|
Brian Behlendorf
|
94dd45c46d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 16:20:54 -08:00 |
|
Brian Behlendorf
|
13c5ef004d
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:20:44 -08:00 |
|
Brian Behlendorf
|
3556e27e42
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-16 16:20:41 -08:00 |
|
Brian Behlendorf
|
af835a2e2f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:20:36 -08:00 |
|
Brian Behlendorf
|
28303e5c31
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-16 16:20:33 -08:00 |
|
Brian Behlendorf
|
23037e829c
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:20:28 -08:00 |
|
Brian Behlendorf
|
b5550a0079
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 16:20:25 -08:00 |
|
Brian Behlendorf
|
68b4501a4a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:20:21 -08:00 |
|
Brian Behlendorf
|
533b65ee25
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-16 16:20:19 -08:00 |
|
Brian Behlendorf
|
a48ed90bb4
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:20:14 -08:00 |
|
Brian Behlendorf
|
1a5fb62672
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-16 16:20:12 -08:00 |
|
Brian Behlendorf
|
746cd7bb87
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:20:06 -08:00 |
|
Brian Behlendorf
|
4a471a8e5c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-16 16:20:03 -08:00 |
|
Brian Behlendorf
|
6a902fe21c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:19:56 -08:00 |
|
Brian Behlendorf
|
725ae1543a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-16 16:19:53 -08:00 |
|
Brian Behlendorf
|
f2bc2f7b6f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 16:19:52 -08:00 |
|
Brian Behlendorf
|
fd4da48000
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 16:19:50 -08:00 |
|
Brian Behlendorf
|
e94598b0fd
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-16 16:19:49 -08:00 |
|
Brian Behlendorf
|
29be0d44ba
|
Resolve conflict
|
2008-12-16 16:19:46 -08:00 |
|
Brian Behlendorf
|
4d21a1c977
|
Resolve two more shadow conflicts
|
2008-12-16 16:14:19 -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
|
d9a176850d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:51 -08:00 |
|
Brian Behlendorf
|
f50ed8e8c6
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 15:52:50 -08:00 |
|
Brian Behlendorf
|
3c1f50cb31
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:47 -08:00 |
|
Brian Behlendorf
|
1f5373d772
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 15:52:46 -08:00 |
|
Brian Behlendorf
|
e4a040bcfe
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:43 -08:00 |
|
Brian Behlendorf
|
1ca850a69b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-16 15:52:41 -08:00 |
|
Brian Behlendorf
|
db446a5422
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:38 -08:00 |
|
Brian Behlendorf
|
cf408f0187
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 15:52:37 -08:00 |
|
Brian Behlendorf
|
ae3d45402c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:34 -08:00 |
|
Brian Behlendorf
|
79a9aad332
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-16 15:52:32 -08:00 |