82c1e3808c
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-11 16:28:42 -08:00
c2f1d3778c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-11 16:28:36 -08:00
245d70e8f1
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-11 16:28:34 -08:00
6157362ad3
Prep for 0.4.8 tag, updated META and ChangeLog
2010-03-11 16:25:03 -08:00
808d785c15
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-11 14:10:33 -08:00
647f19bfba
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-11 14:10:31 -08:00
942b22fa99
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-11 14:10:25 -08:00
6ab65ba583
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-11 14:10:23 -08:00
fb29f2e363
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-11 14:10:17 -08:00
f8c15e245d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-11 14:10:15 -08:00
f755696208
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-11 14:10:08 -08:00
1ec35ca32b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-11 14:10:07 -08:00
aa4fc0302d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-11 14:10:00 -08:00
eb7888a1eb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-11 14:09:58 -08:00
521a08524c
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-11 14:09:52 -08:00
77f449b931
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-11 14:09:50 -08:00
c3d23b6ee9
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-11 14:09:44 -08:00
4ab76207b9
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-11 14:09:42 -08:00
be6f8571e1
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-11 14:09:36 -08:00
08b90b132d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-11 14:09:34 -08:00
d891ba0260
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-11 14:09:28 -08:00
4425d6d053
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-11 14:09:26 -08:00
a5ade20741
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-11 14:09:19 -08:00
de35ba6f9d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-11 14:09:18 -08:00
11408b1060
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-11 14:09:11 -08:00
c0ee5e91cd
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-11 14:09:10 -08:00
788aa1d837
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-11 14:09:09 -08:00
31715cf4eb
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-11 14:08:58 -08:00
0e6b056559
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-11 14:08:56 -08:00
1895e6a76c
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-11 14:08:49 -08:00
153513114a
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-11 14:08:47 -08:00
d371e9d83e
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-11 14:08:41 -08:00
7f31493482
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-11 14:08:39 -08:00
b0436b0a97
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-11 14:08:33 -08:00
af3ec51a96
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-11 14:08:31 -08:00
feee765f99
Remove promise example config replace with a supermicro config
...
The promise config never worked quite right. I'm replacing it with
a Supermicro config which does and which I've tested on a real test
system.
2010-03-11 14:04:12 -08:00
e7b3766a69
Remove udev dependency when running in-tree
...
After much contemplation I can't see a clean way to use udev entirely
in-tree for testing. This patch removed a horrible horrible hack which
would copy the needed udev bits in to place on your system to make it
work. That however is simply not acceptable, nothing you in in-tree
should ever ever ever install something on your system.
Since I could not come up with a clean way to use udev in-tree. The
fix is to simply parse the zdev config file and create the needed
symlinks in a sub-diretory or your working tree. This is not as clean
as using udev but it does work perfectly well for in-tree testing.
2010-03-11 13:56:20 -08:00
49f4e90eca
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-11 10:02:15 -08:00
be593e9f46
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-11 10:02:13 -08:00
7bab53ac65
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-11 10:02:07 -08:00
f68680a4f8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-11 10:02:05 -08:00
fd512c1007
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-11 10:01:59 -08:00
b75cde1e01
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-11 10:01:57 -08:00
5e9c21ce20
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-11 10:01:51 -08:00
38b5ad081b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-11 10:01:50 -08:00
d48278abfa
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-11 10:01:44 -08:00
b258057882
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-11 10:01:42 -08:00
bd89c3332e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-11 10:01:36 -08:00
a47d4e4086
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-11 10:01:34 -08:00
b325c67932
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-11 10:01:28 -08:00
Brian Behlendorf