Brian Behlendorf
|
cebdbdf440
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:02:03 -08:00 |
|
Brian Behlendorf
|
bff435ea95
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-20 17:01:59 -08:00 |
|
Brian Behlendorf
|
40c5baafa2
|
Add file based config, and update the lo config to use real loopback devices, interestingly this currently fails
|
2009-01-20 16:57:45 -08:00 |
|
Brian Behlendorf
|
3a7e1d6fe4
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:25:23 -08:00 |
|
Brian Behlendorf
|
9fea8a6051
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-20 16:25:19 -08:00 |
|
Brian Behlendorf
|
543bac622a
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:25:12 -08:00 |
|
Brian Behlendorf
|
f9cb7c3825
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-20 16:25:09 -08:00 |
|
Brian Behlendorf
|
3fc130e608
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:25:04 -08:00 |
|
Brian Behlendorf
|
849491631f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-20 16:25:01 -08:00 |
|
Brian Behlendorf
|
a7b7dbbb5b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:54 -08:00 |
|
Brian Behlendorf
|
f18ae8b28a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-20 16:24:50 -08:00 |
|
Brian Behlendorf
|
1932827bdb
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:43 -08:00 |
|
Brian Behlendorf
|
5102724fc1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-20 16:24:39 -08:00 |
|
Brian Behlendorf
|
4b8db9524f
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:31 -08:00 |
|
Brian Behlendorf
|
44a8ea0bc9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-20 16:24:28 -08:00 |
|
Brian Behlendorf
|
e6d4b97c42
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:21 -08:00 |
|
Brian Behlendorf
|
5364ceb804
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-20 16:24:17 -08:00 |
|
Brian Behlendorf
|
fa9a9b08a8
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:10 -08:00 |
|
Brian Behlendorf
|
304f0f6d0f
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-20 16:24:08 -08:00 |
|
Brian Behlendorf
|
6f8ec353ee
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:02 -08:00 |
|
Brian Behlendorf
|
9739966be1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-20 16:23:58 -08:00 |
|
Brian Behlendorf
|
44fe6c24e2
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:23:52 -08:00 |
|
Brian Behlendorf
|
4ae1734ee1
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-20 16:23:48 -08:00 |
|
Brian Behlendorf
|
65a87544a7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:23:42 -08:00 |
|
Brian Behlendorf
|
959832c448
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-20 16:23:38 -08:00 |
|
Brian Behlendorf
|
900d45edbd
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:23:31 -08:00 |
|
Brian Behlendorf
|
9e5c8d1394
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-20 16:23:28 -08:00 |
|
Brian Behlendorf
|
6aa22c7518
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:23:21 -08:00 |
|
Brian Behlendorf
|
3abe41dde6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 16:23:18 -08:00 |
|
Brian Behlendorf
|
c05fb180d9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 16:23:17 -08:00 |
|
Brian Behlendorf
|
5bacf1bbac
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:23:05 -08:00 |
|
Brian Behlendorf
|
4a61499d6a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-20 16:23:01 -08:00 |
|
Brian Behlendorf
|
e10c78afb6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 16:23:00 -08:00 |
|
Brian Behlendorf
|
647101828f
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:22:48 -08:00 |
|
Brian Behlendorf
|
7b3bc193d1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-20 16:22:45 -08:00 |
|
Brian Behlendorf
|
bfea6eac07
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:22:40 -08:00 |
|
Brian Behlendorf
|
50c0accef1
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-20 16:22:37 -08:00 |
|
Brian Behlendorf
|
6660cc4f33
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:22:32 -08:00 |
|
Brian Behlendorf
|
78d04cd709
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-20 16:22:28 -08:00 |
|
Brian Behlendorf
|
8d4354d093
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:22:21 -08:00 |
|
Brian Behlendorf
|
19f07cfedf
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-20 16:22:18 -08:00 |
|
Brian Behlendorf
|
9d3fcc5c58
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:22:11 -08:00 |
|
Brian Behlendorf
|
ac59289678
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-20 16:22:08 -08:00 |
|
Brian Behlendorf
|
4e2b04d93f
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:22:00 -08:00 |
|
Brian Behlendorf
|
c716706ced
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-20 16:21:57 -08:00 |
|
Brian Behlendorf
|
e9428b1ff3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:21:49 -08:00 |
|
Brian Behlendorf
|
c9a99d4ccf
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-20 16:21:46 -08:00 |
|
Brian Behlendorf
|
5a145659a3
|
Refresh README
|
2009-01-20 16:16:57 -08:00 |
|
Brian Behlendorf
|
a651f9e82e
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:56:54 -08:00 |
|
Brian Behlendorf
|
2334ba2bb1
|
Add a script scripts, update Makefiles
|
2009-01-20 15:54:50 -08:00 |