7c87446ab8
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-23 12:27:48 -07:00
74b67983f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-23 12:24:39 -07:00
edb22b6a3e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-23 12:24:38 -07:00
53fcde4a48
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-10-23 12:24:37 -07:00
d8d360724d
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-10-23 12:24:37 -07:00
5972702242
Add two more possible uninit vars flagged by gcc.
2009-10-23 11:43:09 -07:00
3e32c771b0
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-21 12:04:07 -07:00
5bf14d3400
Update zpool-configs to be udev aware.
...
To simplify creation and management of test configurations the
dragon and x4550 configureis have been integrated with udev. Our
current best guess as to how we'll actually manage the disks in
these systems is with a udev mapping scheme. The current leading
scheme is to map each drive to a simpe <CHANNEL><RANK> id. In
this mapping each CHANNEL is represented by the letters a-z, and
the RANK is represented by the numbers 1-n. A CHANNEL should
identify a group of RANKS which are all attached to a single
controller, each RANK represents a disk. This provides a nice
mechanism to locate a specific drive given a known hardware
configuration. Various hardware vendors use a similar scheme.
A nice side effect of these changes is it allowed me to make
the raid0/raid10/raidz/raidz2 setup functions generic. This
makes adding new test configs easy, you just need to create
a udev rules file for your test config which conforms to the
naming scheme.
2009-10-21 11:38:51 -07:00
75b14a7c2e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-15 16:44:49 -07:00
a09d33e929
Update build system for libblkid integration
2009-10-15 16:25:18 -07:00
1c4a603c81
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-14 15:58:31 -07:00
085ed9fe82
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-14 15:57:10 -07:00
cb678c0b31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-14 15:57:09 -07:00
9ea3f53d0c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-10-14 15:57:09 -07:00
a8adb61c00
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-10-14 15:57:08 -07:00
09a8c99097
Additional build system update for libefi library.
...
This include updating all the Makefile.am to have the correct
include paths and libraries. In addition, the zlib m4 macro was
updated to more correctly integrate with the Makefiles. And I
added two new macros libblkid and libuuid which will be needed by
subsequent commits for blkid and uuid support respectively. The
blkid support is optional, the uuid support is mandatory for libefi.
2009-10-14 15:47:41 -07:00
39d85a8b94
Remove pragmas from new libefi files.
2009-10-14 15:44:22 -07:00
7d9b89f749
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-09 16:43:29 -07:00
cb91bbe6ce
Additional set of build system tweaks for libefi library.
2009-10-09 16:37:32 -07:00
040e6c020f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-09 16:09:30 -07:00
a0337cfcd8
Add libefi library in to the build system.
2009-10-09 15:58:45 -07:00
6e242e97ab
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-09 15:44:58 -07:00
e0e0f0ea84
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-09 15:43:33 -07:00
2b2fd27e18
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-10-09 15:43:32 -07:00
ad0f8481d2
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-10-09 15:43:31 -07:00
b60766e22f
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-10-09 15:43:31 -07:00
7698515ec4
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-10-09 15:43:30 -07:00
6df047f11f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-10-09 15:43:30 -07:00
46fa16ed8c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-10-09 15:43:28 -07:00
656d8f6b22
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-10-09 15:43:28 -07:00
46b272f2c4
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-10-09 15:43:25 -07:00
1b7a8f5e26
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-10-09 15:43:24 -07:00
a4c68aa767
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-10-09 15:43:23 -07:00
873470861e
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2009-10-09 15:43:23 -07:00
27c7573a5e
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-10-09 15:43:22 -07:00
6d3da13a7d
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-10-09 15:43:21 -07:00
00699175eb
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-10-09 15:43:20 -07:00
69d396e7e0
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-10-09 15:43:20 -07:00
3b18b22fb3
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-10-09 15:43:18 -07:00
38a311ac31
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-10-09 15:43:18 -07:00
ed89c3baec
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-10-09 15:43:17 -07:00
d7d86be950
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-10-09 15:43:16 -07:00
dbdf553198
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-10-09 15:43:15 -07:00
e59c225cea
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-10-09 15:43:15 -07:00
3d7d195f48
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-10-09 15:43:13 -07:00
49529232e1
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-10-09 15:43:13 -07:00
1719b6ee81
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-10-09 15:43:12 -07:00
dd666623a4
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-10-09 15:43:11 -07:00
1d88115083
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-10-09 15:43:10 -07:00
fb2c44bdfc
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-10-09 15:43:10 -07:00
Brian Behlendorf