Brian Behlendorf
dc80b6b162
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-16 21:11:55 -07:00
Brian Behlendorf
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
Brian Behlendorf
8e96f01f2a
Merge commit 'refs/top-bases/top' into top
2010-08-16 17:21:22 -07:00
Brian Behlendorf
593d5a361f
Refresh autogen.sh products
2010-08-16 17:04:57 -07:00
Brian Behlendorf
8562c820ab
Merge commit 'refs/top-bases/top' into top
2010-08-16 16:46:51 -07:00
Brian Behlendorf
528be69b84
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-08-16 16:46:49 -07:00
Brian Behlendorf
8983ba9183
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-16 16:46:47 -07:00
Brian Behlendorf
773fd1902b
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:46 -07:00
Brian Behlendorf
30286a068f
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-16 16:46:43 -07:00
Brian Behlendorf
62a25cf5fb
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:36 -07:00
Brian Behlendorf
7be9cae9aa
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-16 16:46:33 -07:00
Brian Behlendorf
1062bca41d
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:26 -07:00
Brian Behlendorf
3c251f1c7d
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-16 16:46:23 -07:00
Brian Behlendorf
99837e234b
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:16 -07:00
Brian Behlendorf
26ee45e3c8
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-16 16:46:13 -07:00
Brian Behlendorf
3980848439
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-16 16:46:06 -07:00
Brian Behlendorf
7a70fd4a05
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-16 16:46:03 -07:00
Brian Behlendorf
055aeb686e
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-16 16:45:55 -07:00
Brian Behlendorf
bd9b58b29a
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-16 16:45:53 -07:00
Brian Behlendorf
4f6f2ed156
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-16 16:45:45 -07:00
Brian Behlendorf
0c74eaf68e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-16 16:45:43 -07:00
Brian Behlendorf
bb0d79faf0
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-16 16:45:35 -07:00
Brian Behlendorf
d0fe2827b9
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-16 16:45:32 -07:00
Brian Behlendorf
e991d966b5
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-16 16:45:25 -07:00
Brian Behlendorf
b1a57d80ce
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-16 16:45:22 -07:00
Brian Behlendorf
7f3cb4da8a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-16 16:45:15 -07:00
Brian Behlendorf
791f5b503c
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-16 16:45:12 -07:00
Brian Behlendorf
18d9462847
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-16 16:45:05 -07:00
Brian Behlendorf
00e631c0ff
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-16 16:45:02 -07:00
Brian Behlendorf
a551784f88
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-16 16:44:55 -07:00
Brian Behlendorf
402a5129a0
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-16 16:44:53 -07:00
Brian Behlendorf
4455fbe18f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-16 16:44:45 -07:00
Brian Behlendorf
d3bfb737f8
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-16 16:44:42 -07:00
Brian Behlendorf
4306ea6335
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-16 16:44:35 -07:00
Brian Behlendorf
b762e575ee
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-16 16:44:32 -07:00
Brian Behlendorf
dd06ae9800
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-16 16:44:24 -07:00
Brian Behlendorf
6294cada1a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-16 16:44:22 -07:00
Brian Behlendorf
e9facea555
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-16 16:44:14 -07:00
Brian Behlendorf
a2a5f19026
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-16 16:44:12 -07:00
Brian Behlendorf
01d2f92b00
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-16 16:44:04 -07:00
Brian Behlendorf
863ba213d6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-16 16:44:02 -07:00
Brian Behlendorf
2d2c36dffd
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-16 16:43:54 -07:00
Brian Behlendorf
bfefda9ef9
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-16 16:43:51 -07:00
Brian Behlendorf
e57cec8bf4
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-16 16:43:44 -07:00
Brian Behlendorf
bfa310466d
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-16 16:43:42 -07:00
Brian Behlendorf
fbe31d8a21
Make interlibrary dependencies explicit
...
See commit e69bd526c1
2010-08-16 16:37:39 -07:00
Sebastian Pipping
e69bd526c1
Make interlibrary dependencies explicit
...
Under the latest Gentoo (2.6.34-gentoo-r2) the interlibrary
dependencies must be made explicit. This is likely due to
the --as-needed linker option which is commonly used under
Gentoo. This option requires that the linker only include
the minimum set of symbols required by the binary. Without
the full dependency tree the linker would need to bring in
all the symbols from dependent libraries.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-08-16 16:24:36 -07:00
Brian Behlendorf
a1a73f60e4
Merge commit 'refs/top-bases/top' into top
2010-08-16 16:20:39 -07:00
Brian Behlendorf
f82f5c5556
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-08-16 16:20:37 -07:00
Brian Behlendorf
44af544340
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-16 16:20:36 -07:00
