59fc1a30ed
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-02 10:06:58 -08:00
91bc029f17
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-02 10:06:49 -08:00
9199e2c033
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-02 10:06:47 -08:00
4e56b9184a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-02 10:06:38 -08:00
06d354b4f3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
cmd/Makefile.am
2010-03-02 10:06:26 -08:00
9afa66806b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-02 10:05:11 -08:00
44d8092c2c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-02 10:05:09 -08:00
697b37849c
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-02 10:05:00 -08:00
2ec7dfbec7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-02 10:04:58 -08:00
085e6ed95e
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-02 10:04:50 -08:00
0306b46c52
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-02 10:04:48 -08:00
a838a373ba
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-02 10:04:37 -08:00
163573415b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-02 10:04:35 -08:00
0529d6c184
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-02 10:04:26 -08:00
5ff2c8f6cd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-02 10:04:24 -08:00
a54b1eacad
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-02 10:04:16 -08:00
9abaa78c6f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-02 10:04:14 -08:00
5455070ca1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-02 10:04:12 -08:00
f5cbc25810
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-02 10:03:57 -08:00
c9b00a0735
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-02 10:03:55 -08:00
12a686837d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-02 10:03:47 -08:00
0d74a5a14e
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-02 10:03:44 -08:00
83423440ea
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-02 10:03:36 -08:00
4ee4277f2f
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-02 10:03:34 -08:00
e6d92ae57d
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/Makefile.am
2010-03-02 10:01:51 -08:00
8673d39225
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-01 17:05:19 -08:00
7df02c0f57
Split the udev rule from a specific configuration
...
While I completely agree the udev is the lesser of many possibles
evils when solving the device issue... it is still evil. After
attempting to craft a single rule which will work for various
versions of udev in various distros. I've come to the conclusion
the only maintainable way to solve this issue is to split the rule
from any particular configuration.
This commit provides a generic 60-zpool.rules file which use a
small helper util 'zpool_id' to parse a configuration file by
default located in /etc/zfs/zdev.conf. The helper script maps
a by-path udev name to a more friendly name of <channel><rank>
for large configurations.
As part of this change all of the support scripts why rely on
this udev naming convention have been updated as needed. Example
zdev.conf files have also been added for 3 different systems by
you will always need to add one for your exact hardware.
Finally, included in these changes are the proper tweaks to the
build system to ensure everything still get's packaged properly
in the rpms and can run in or out of tree.
2010-03-01 16:51:21 -08:00
8ea6ff32cd
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-01-08 11:40:36 -08:00
c0d57fb8a3
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:36 -08:00
79b5a59e2c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:32 -08:00
6c1f5a126c
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-01-08 11:40:31 -08:00
61baf992ea
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:28 -08:00
e6d48382f3
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-01-08 11:40:27 -08:00
976c0ea697
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:24 -08:00
b08877ce8b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-01-08 11:40:23 -08:00
2ebee09b55
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:19 -08:00
efc3e7a375
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-01-08 11:40:18 -08:00
66b6b442dc
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:15 -08:00
60c9121dd2
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-01-08 11:40:14 -08:00
cd66df7819
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-01-08 11:40:10 -08:00
3f0a6fc27f
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:10 -08:00
15aef515e8
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:06 -08:00
23e9537611
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-01-08 11:40:05 -08:00
ba8f0962e7
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-01-08 11:40:02 -08:00
6037f5f124
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-01-08 11:40:01 -08:00
a457284ad3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-01-08 11:39:57 -08:00
e4a4e686cd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-01-08 11:39:56 -08:00
05f0979092
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-01-08 11:39:53 -08:00
237341f2ce
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-01-08 11:39:52 -08:00
39d8b611e3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-01-08 11:39:52 -08:00
Brian Behlendorf