903285994d
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-16 16:20:34 -07:00
fc593995d3
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-16 16:20:32 -07:00
7ee6834b1e
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-16 16:20:24 -07:00
287884397a
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-16 16:20:22 -07:00
823bd51105
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-16 16:20:14 -07:00
e345c382ab
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-16 16:20:12 -07:00
8e2ad0d50a
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-16 16:20:04 -07:00
54dbb37a2c
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-16 16:20:02 -07:00
7ae169245c
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-16 16:19:54 -07:00
92be2aece5
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-16 16:19:52 -07:00
04b9961d22
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-16 16:19:44 -07:00
25dfd39d38
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-16 16:19:42 -07:00
797b44c854
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-16 16:19:34 -07:00
a74f7b5683
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-16 16:19:32 -07:00
9afa678585
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-16 16:19:24 -07:00
6539a47aea
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-16 16:19:21 -07:00
48aec81399
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-16 16:19:14 -07:00
a4594d9cd3
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-16 16:19:12 -07:00
2de2a20758
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-16 16:19:04 -07:00
e20ff44328
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-16 16:19:02 -07:00
a7eb917496
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-16 16:18:54 -07:00
9d6393b47b
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-16 16:18:52 -07:00
877afea62d
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-16 16:18:44 -07:00
2b43327f1c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-16 16:18:42 -07:00
6c550515f2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-16 16:18:34 -07:00
3345aea058
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
cmd/Makefile.am
2010-08-16 16:18:24 -07:00
e4deda5aaf
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-16 16:17:20 -07:00
c397c1ba5b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-16 16:17:18 -07:00
7e345a7985
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-16 16:17:10 -07:00
675ee07c6e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-16 16:17:08 -07:00
eb06215301
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-16 16:17:00 -07:00
21cc9de2fc
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-16 16:16:58 -07:00
6b6f5d3a52
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-16 16:16:50 -07:00
d8a2e76e45
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-16 16:16:48 -07:00
fdcfcb1a7a
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-16 16:16:40 -07:00
b406fe1831
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-16 16:16:37 -07:00
359a7bda2f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/Makefile.am
2010-08-16 16:14:32 -07:00
36c3afd311
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-16 16:06:50 -07:00
7f939f28eb
Add zpool_layout command
...
The zpool_layout command is designed to automatically scan the
udev /dev/disk/by-path directory and generate a /etc/zfs/zdev.conf
file. It does this by enumerating the disks attached to the
specified buses/ports and sequentially mapping them to short
<channel><rank> names in /dev/disk/zpool/. This tool should only
be run after all the available disks have been discovered. And
the resulting config file does not need to be regenerated unless
your backend configuration changes.
2010-08-16 15:54:06 -07:00
18568e1138
Merge commit 'refs/top-bases/top' into top
2010-08-13 11:04:10 -07:00
130331e1bc
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-08-13 11:04:09 -07:00
94dcc71ea6
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-13 11:04:07 -07:00
034ce5a944
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-13 11:04:05 -07:00
4883a9eff6
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-13 11:04:03 -07:00
fddab1181a
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-13 11:03:57 -07:00
21179cf3d6
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-13 11:03:55 -07:00
1b23d20fca
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-13 11:03:48 -07:00
597ce2c8e4
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-13 11:03:46 -07:00
38dc51734e
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-13 11:03:40 -07:00
174f7c9d19
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-13 11:03:38 -07:00
Brian Behlendorf