191c500c47
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-16 21:14:57 -07:00
ee4c3178d8
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-16 21:14:56 -07:00
2a686dc28a
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-16 21:14:53 -07:00
4f3afed4e6
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-16 21:14:46 -07:00
d08a248af6
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-16 21:14:44 -07:00
ab887f7aa0
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-16 21:14:36 -07:00
320a24add3
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-16 21:14:34 -07:00
693c4acab0
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-16 21:14:27 -07:00
b4dfc3ffc8
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-16 21:14:24 -07:00
4074199fd7
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-16 21:14:17 -07:00
f50e5be926
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-16 21:14:15 -07:00
baac191ffb
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-16 21:14:07 -07:00
b101cd1c0e
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-16 21:14:05 -07:00
1ef6578d42
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-16 21:13:57 -07:00
b7f3425903
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-16 21:13:55 -07:00
b7ade54818
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-16 21:13:47 -07:00
96e587bf75
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-16 21:13:45 -07:00
fafaa9fc66
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-16 21:13:37 -07:00
abce06de76
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-16 21:13:35 -07:00
e963a26765
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-16 21:13:27 -07:00
5bd60e1af8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-16 21:13:25 -07:00
ef348e8041
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-16 21:13:17 -07:00
417e3e1719
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-16 21:13:15 -07:00
c67ec459b6
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-16 21:13:07 -07:00
423521d58d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-16 21:13:05 -07:00
3868ce124f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-16 21:12:57 -07:00
389bd6849c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-16 21:12:55 -07:00
fc3b095482
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-16 21:12:48 -07:00
b700c8f4ea
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-16 21:12:45 -07:00
7e3b1d4b35
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-16 21:12:38 -07:00
fafd60c354
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-16 21:12:35 -07:00
bf8bda0f17
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-16 21:12:27 -07:00
26887d837b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-16 21:12:25 -07:00
5bf9f1237e
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-16 21:12:17 -07:00
479ad063cb
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-16 21:12:15 -07:00
6d54b1545a
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-16 21:12:07 -07:00
db9877dcb0
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-16 21:12:05 -07:00
cb2ed434d5
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-16 21:11:57 -07:00
dc80b6b162
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-16 21:11:55 -07:00
204ed75462
Cleanly handle partitions in zpool_layout
...
I knew I'd forget something in the first version of this script.
It turns out what I forgot was partition handling, this commit
ensures duplicate entries are not created in the zdev.conf file.
This previously could occur due to partition entires in the by-path
directory. This is not needed the existing udev rules will ensure
the partitions are created in /dev/disk/zpool/.
2010-08-16 20:58:43 -07:00
8983ba9183
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-16 16:46:47 -07:00
773fd1902b
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:46 -07:00
30286a068f
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-16 16:46:43 -07:00
62a25cf5fb
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:36 -07:00
7be9cae9aa
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-16 16:46:33 -07:00
1062bca41d
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:26 -07:00
3c251f1c7d
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-16 16:46:23 -07:00
99837e234b
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:16 -07:00
26ee45e3c8
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-16 16:46:13 -07:00
3980848439
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:06 -07:00
Brian Behlendorf