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 |
|
Brian Behlendorf
|
5129dd4edd
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:29 -08:00 |
|
Brian Behlendorf
|
4a0630d83e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-16 15:52:28 -08:00 |
|
Brian Behlendorf
|
2cfbf7ec8d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:25 -08:00 |
|
Brian Behlendorf
|
5733c4b584
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-16 15:52:24 -08:00 |
|
Brian Behlendorf
|
ee8a9195e7
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:21 -08:00 |
|
Brian Behlendorf
|
ee57e2a71f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-16 15:52:19 -08:00 |
|
Brian Behlendorf
|
18f778ac83
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:16 -08:00 |
|
Brian Behlendorf
|
70c7936ebf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 15:52:15 -08:00 |
|
Brian Behlendorf
|
15d6e4fe4b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:12 -08:00 |
|
Brian Behlendorf
|
bad9c6965c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 15:52:11 -08:00 |
|
Brian Behlendorf
|
7f132b2535
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:07 -08:00 |
|
Brian Behlendorf
|
afc91005b1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 15:52:06 -08:00 |
|
Brian Behlendorf
|
a8bc3d15ec
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:52:03 -08:00 |
|
Brian Behlendorf
|
81d93f2cb4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 15:52:02 -08:00 |
|
Brian Behlendorf
|
3f3baa5d19
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 15:52:01 -08:00 |
|
Brian Behlendorf
|
003a903053
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:56 -08:00 |
|
Brian Behlendorf
|
b64059f031
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-16 15:51:55 -08:00 |
|
Brian Behlendorf
|
cc53801767
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 15:51:54 -08:00 |
|
Brian Behlendorf
|
aed184b052
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:49 -08:00 |
|
Brian Behlendorf
|
13cc892152
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-16 15:51:48 -08:00 |
|
Brian Behlendorf
|
b3abc249a7
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:44 -08:00 |
|
Brian Behlendorf
|
88d7e80fe2
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-16 15:51:43 -08:00 |
|
Brian Behlendorf
|
50f200f7aa
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:40 -08:00 |
|
Brian Behlendorf
|
a77d20e66b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 15:51:39 -08:00 |
|
Brian Behlendorf
|
b09a62570a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:36 -08:00 |
|
Brian Behlendorf
|
7cdee6401d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-16 15:51:34 -08:00 |
|
Brian Behlendorf
|
927404ab2c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:31 -08:00 |
|
Brian Behlendorf
|
93a2ebff4a
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-16 15:51:30 -08:00 |
|
Brian Behlendorf
|
e92ff63a0d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:27 -08:00 |