Brian Behlendorf
|
7f4f3039f8
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:42 -08:00 |
|
Brian Behlendorf
|
839a421452
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-13 11:57:40 -08:00 |
|
Brian Behlendorf
|
f69793c299
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:37 -08:00 |
|
Brian Behlendorf
|
679b739731
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-13 11:57:35 -08:00 |
|
Brian Behlendorf
|
fbf9859f4d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:32 -08:00 |
|
Brian Behlendorf
|
35a3d014c5
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 11:57:31 -08:00 |
|
Brian Behlendorf
|
65f0a3dbaa
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:28 -08:00 |
|
Brian Behlendorf
|
365948cb36
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 11:57:26 -08:00 |
|
Brian Behlendorf
|
71a8872efb
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:23 -08:00 |
|
Brian Behlendorf
|
a2c46bae3f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 11:57:22 -08:00 |
|
Brian Behlendorf
|
8f4ae7a03d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:18 -08:00 |
|
Brian Behlendorf
|
db4ac6a25f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 11:57:17 -08:00 |
|
Brian Behlendorf
|
407284e688
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:14 -08:00 |
|
Brian Behlendorf
|
b40ad58927
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 11:57:13 -08:00 |
|
Brian Behlendorf
|
fafbdf448a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 11:57:12 -08:00 |
|
Brian Behlendorf
|
4a5b46ab97
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:07 -08:00 |
|
Brian Behlendorf
|
16e1bda84b
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 11:57:05 -08:00 |
|
Brian Behlendorf
|
04a87f57ca
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 11:57:05 -08:00 |
|
Brian Behlendorf
|
bccc79b2c9
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:59 -08:00 |
|
Brian Behlendorf
|
306d0df7bf
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-13 11:56:57 -08:00 |
|
Brian Behlendorf
|
f5ad4208db
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:54 -08:00 |
|
Brian Behlendorf
|
61a8396893
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-13 11:56:53 -08:00 |
|
Brian Behlendorf
|
331445ab72
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:50 -08:00 |
|
Brian Behlendorf
|
daa7e47c22
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-13 11:56:48 -08:00 |
|
Brian Behlendorf
|
a9bb87ff73
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:45 -08:00 |
|
Brian Behlendorf
|
6238e451b7
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-13 11:56:43 -08:00 |
|
Brian Behlendorf
|
eb509e430e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:40 -08:00 |
|
Brian Behlendorf
|
1c2e78380b
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 11:56:39 -08:00 |
|
Brian Behlendorf
|
0f299bdf64
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:36 -08:00 |
|
Brian Behlendorf
|
c230164e1a
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-13 11:56:34 -08:00 |
|
Brian Behlendorf
|
56603384cf
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:31 -08:00 |
|
Brian Behlendorf
|
624c7073e7
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 11:56:29 -08:00 |
|
Brian Behlendorf
|
bba6e9829d
|
Handle the case when 'module-name=' is passed down without args. This is handy and shouldn't generate warnings
|
2009-01-13 11:54:38 -08:00 |
|
Brian Behlendorf
|
6caf53f208
|
Minor script update
|
2009-01-13 11:53:51 -08:00 |
|
Brian Behlendorf
|
f15ef90618
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:18:11 -08:00 |
|
Brian Behlendorf
|
7356c2045e
|
Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message
|
2009-01-13 11:16:12 -08:00 |
|
Brian Behlendorf
|
faeb9fd5b0
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-13 09:55:42 -08:00 |
|
Brian Behlendorf
|
7f9ce14e58
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 09:55:40 -08:00 |
|
Brian Behlendorf
|
5c1e30ef6f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-13 09:55:37 -08:00 |
|
Brian Behlendorf
|
ddb173d2b9
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 09:55:36 -08:00 |
|
Brian Behlendorf
|
6fb39a7c33
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 09:55:35 -08:00 |
|
Brian Behlendorf
|
09b6f64e2d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 09:55:30 -08:00 |
|
Brian Behlendorf
|
cae8f09ec5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 09:55:27 -08:00 |
|
Brian Behlendorf
|
ef6d827a88
|
Don't check HAVE_SPL unavailable in userspace build
|
2009-01-13 09:53:35 -08:00 |
|
Brian Behlendorf
|
464874c029
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:54:18 -08:00 |
|
Brian Behlendorf
|
a62a385848
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 16:54:15 -08:00 |
|
Brian Behlendorf
|
701a72aafb
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:54:08 -08:00 |
|
Brian Behlendorf
|
0093e81879
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 16:54:05 -08:00 |
|
Brian Behlendorf
|
ca328c5d30
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 16:54:04 -08:00 |
|
Brian Behlendorf
|
13ab1d30be
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:53:53 -08:00 |