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
01154e6b75
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-03-11 10:02:16 -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
bbd1c6c17e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-11 10:01:26 -08:00
ac7d885bae
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-11 10:01:20 -08:00
dcb855dc6e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-11 10:01:18 -08:00
d271d3caa7
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-11 10:01:12 -08:00
d58b0fe3d3
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-11 10:01:11 -08:00
bc678dfe14
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-11 10:01:05 -08:00
bdfdfcc069
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-11 10:01:03 -08:00
5db06c49ff
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-11 10:00:57 -08:00
523f1bcffe
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-11 10:00:55 -08:00
6397e5a8a5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-11 10:00:54 -08:00
8de6e54104
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-11 10:00:43 -08:00
274cd545ce
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-11 10:00:41 -08:00
aa76f00910
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-11 10:00:35 -08:00
cabfd8d674
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-11 10:00:33 -08:00
f08aef2c25
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-11 10:00:27 -08:00
d8077963ff
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-11 10:00:25 -08:00
e65e071268
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-11 10:00:20 -08:00
0b627ac3c2
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-11 10:00:17 -08:00
fddf5c888f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-11 09:55:44 -08:00
ce1160b5b9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:43 -08:00
5e4f96bb2f
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-11 09:55:42 -08:00
2269c6aef0
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-11 09:55:41 -08:00
5302158673
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-11 09:55:41 -08:00
7d196935b2
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-03-11 09:55:40 -08:00
389bb5a604
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-03-11 09:55:39 -08:00
a20a614a87
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-03-11 09:55:38 -08:00
db0227bc9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:36 -08:00
59d56028e7
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-03-11 09:55:35 -08:00
Brian Behlendorf