Brian Behlendorf
|
dbcabee9bc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:46 -08:00 |
|
Brian Behlendorf
|
75430ce903
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-20 14:13:44 -08:00 |
|
Brian Behlendorf
|
99f1b2b564
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:41 -08:00 |
|
Brian Behlendorf
|
7f6b2f97c8
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-20 14:13:40 -08:00 |
|
Brian Behlendorf
|
2b6fa3ff11
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:36 -08:00 |
|
Brian Behlendorf
|
0f291cb243
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-20 14:13:35 -08:00 |
|
Brian Behlendorf
|
565b8d5a85
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:31 -08:00 |
|
Brian Behlendorf
|
3c2329d1a1
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-20 14:13:30 -08:00 |
|
Brian Behlendorf
|
ed4b892495
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:27 -08:00 |
|
Brian Behlendorf
|
592a9c0698
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-20 14:13:25 -08:00 |
|
Brian Behlendorf
|
7b6629e602
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:22 -08:00 |
|
Brian Behlendorf
|
ec92737041
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-20 14:13:20 -08:00 |
|
Brian Behlendorf
|
765f8bbc04
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:17 -08:00 |
|
Brian Behlendorf
|
96e6ad4994
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 14:13:16 -08:00 |
|
Brian Behlendorf
|
748cc32561
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 14:13:15 -08:00 |
|
Brian Behlendorf
|
fbaa611641
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:10 -08:00 |
|
Brian Behlendorf
|
69a9253df2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-20 14:13:08 -08:00 |
|
Brian Behlendorf
|
84be1f196c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 14:13:08 -08:00 |
|
Brian Behlendorf
|
1c4d9c553a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:13:02 -08:00 |
|
Brian Behlendorf
|
35dde2f8f5
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-20 14:13:00 -08:00 |
|
Brian Behlendorf
|
f9f56714ac
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:12:57 -08:00 |
|
Brian Behlendorf
|
99b7154d59
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-20 14:12:56 -08:00 |
|
Brian Behlendorf
|
532b7a7177
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:12:53 -08:00 |
|
Brian Behlendorf
|
755eb07b22
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-20 14:12:51 -08:00 |
|
Brian Behlendorf
|
57b8b128db
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:12:48 -08:00 |
|
Brian Behlendorf
|
0c9d13b36a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-20 14:12:46 -08:00 |
|
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 |