Brian Behlendorf
|
cc8247aec7
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:12:43 -08:00 |
|
Brian Behlendorf
|
f5dbdb52f3
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-20 14:12:41 -08:00 |
|
Brian Behlendorf
|
5a627f0a5e
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:12:38 -08:00 |
|
Brian Behlendorf
|
3422ccdbbe
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-20 14:12:36 -08:00 |
|
Brian Behlendorf
|
d163810def
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:12:33 -08:00 |
|
Brian Behlendorf
|
5aaec2c936
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-20 14:12:29 -08:00 |
|
Brian Behlendorf
|
db210bf236
|
Add destroy functionality to zpool create, needed for generic use by zpios.sh
|
2009-01-20 14:10:30 -08:00 |
|
Brian Behlendorf
|
8deb13ad0d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-16 15:09:23 -08:00 |
|
Brian Behlendorf
|
7ac621f98b
|
Update zpios usage
|
2009-01-16 15:07:30 -08:00 |
|
Brian Behlendorf
|
0c1823b02d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-16 15:00:42 -08:00 |
|
Brian Behlendorf
|
81a6dfd781
|
Minor cleanup, module unload
|
2009-01-16 14:58:48 -08:00 |
|
Brian Behlendorf
|
26893761c8
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:56:13 -08:00 |
|
Brian Behlendorf
|
d5fe3376ff
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-16 14:56:11 -08:00 |
|
Brian Behlendorf
|
613af63453
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:56:08 -08:00 |
|
Brian Behlendorf
|
11f73988a2
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-16 14:56:07 -08:00 |
|
Brian Behlendorf
|
2f983e027b
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:56:04 -08:00 |
|
Brian Behlendorf
|
9c0473f8a7
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-16 14:56:02 -08:00 |
|
Brian Behlendorf
|
ea424f6afd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:59 -08:00 |
|
Brian Behlendorf
|
fc8c96da61
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-16 14:55:58 -08:00 |
|
Brian Behlendorf
|
077bd42ecc
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:54 -08:00 |
|
Brian Behlendorf
|
188291aa77
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-16 14:55:53 -08:00 |
|
Brian Behlendorf
|
9e67a03730
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:50 -08:00 |
|
Brian Behlendorf
|
def2d70ec2
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-16 14:55:48 -08:00 |
|
Brian Behlendorf
|
db13fa56ef
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:45 -08:00 |
|
Brian Behlendorf
|
543f983b5e
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-16 14:55:43 -08:00 |
|
Brian Behlendorf
|
8ef22991ae
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:40 -08:00 |
|
Brian Behlendorf
|
c668ebf0c4
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-16 14:55:39 -08:00 |
|
Brian Behlendorf
|
a5af2a99af
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:36 -08:00 |
|
Brian Behlendorf
|
dab9e4621b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-16 14:55:34 -08:00 |
|
Brian Behlendorf
|
93c81a0970
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:31 -08:00 |
|
Brian Behlendorf
|
9f13545f9e
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-16 14:55:29 -08:00 |
|
Brian Behlendorf
|
ca804c66f8
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:26 -08:00 |
|
Brian Behlendorf
|
b8be59d968
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-16 14:55:25 -08:00 |
|
Brian Behlendorf
|
6ced15670e
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:21 -08:00 |
|
Brian Behlendorf
|
110831eaa0
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-16 14:55:20 -08:00 |
|
Brian Behlendorf
|
81a3e09762
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:17 -08:00 |
|
Brian Behlendorf
|
4b794f989e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-16 14:55:16 -08:00 |
|
Brian Behlendorf
|
214859515d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-16 14:55:15 -08:00 |
|
Brian Behlendorf
|
12b92e5b89
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:10 -08:00 |
|
Brian Behlendorf
|
13a2ef20ed
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 14:55:08 -08:00 |
|
Brian Behlendorf
|
e74df386c4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 14:55:08 -08:00 |
|
Brian Behlendorf
|
ddb9a34cc6
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:55:02 -08:00 |
|
Brian Behlendorf
|
7088e53f64
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-16 14:55:01 -08:00 |
|
Brian Behlendorf
|
539229b77c
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:54:58 -08:00 |
|
Brian Behlendorf
|
18832493bd
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-16 14:54:56 -08:00 |
|
Brian Behlendorf
|
5a5f268b0a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:54:53 -08:00 |
|
Brian Behlendorf
|
b6a7022bfc
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-16 14:54:51 -08:00 |
|
Brian Behlendorf
|
9ec2644743
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:54:48 -08:00 |
|
Brian Behlendorf
|
1d0244c4d0
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-16 14:54:47 -08:00 |
|
Brian Behlendorf
|
6b863d791d
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:54:43 -08:00 |