Brian Behlendorf
5c86e9cad6
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-14 15:57:11 -07:00
Brian Behlendorf
085ed9fe82
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-14 15:57:10 -07:00
Brian Behlendorf
cb678c0b31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-14 15:57:09 -07:00
Brian Behlendorf
9ea3f53d0c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-10-14 15:57:09 -07:00
Brian Behlendorf
a8adb61c00
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-10-14 15:57:08 -07:00
Brian Behlendorf
8a905e7dcc
Update vtoc.h header and add missing mhd.h header needed by libefi.
2009-10-14 15:52:24 -07:00
Brian Behlendorf
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
Brian Behlendorf
39d85a8b94
Remove pragmas from new libefi files.
2009-10-14 15:44:22 -07:00
Brian Behlendorf
4b74293ba9
Merge commit 'refs/top-bases/top' into top
2009-10-09 16:47:51 -07:00
Brian Behlendorf
00c6a706a5
Refresh autogen products
2009-10-09 16:46:19 -07:00
Brian Behlendorf
4724ffdced
Merge commit 'refs/top-bases/top' into top
2009-10-09 16:44:49 -07:00
Brian Behlendorf
8dc5609e72
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-09 16:44:47 -07:00
Brian Behlendorf
24bde269c2
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-10-09 16:44:45 -07:00
Brian Behlendorf
96b06c2c31
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:44 -07:00
Brian Behlendorf
a215e35e77
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-09 16:44:42 -07:00
Brian Behlendorf
6dda0ef530
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:36 -07:00
Brian Behlendorf
6b40b82861
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-09 16:44:35 -07:00
Brian Behlendorf
880e04ea66
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:29 -07:00
Brian Behlendorf
2fd5a539e9
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-09 16:44:27 -07:00
Brian Behlendorf
17b2ca2cda
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:21 -07:00
Brian Behlendorf
2f001ab9ea
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-09 16:44:19 -07:00
Brian Behlendorf
1df5c99bd4
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:11 -07:00
Brian Behlendorf
9fb47da60f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-09 16:44:10 -07:00
Brian Behlendorf
82177ca67b
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:03 -07:00
Brian Behlendorf
89eadc4abd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-10-09 16:44:01 -07:00
Brian Behlendorf
267d3a18cd
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:55 -07:00
Brian Behlendorf
81ec3f8951
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-09 16:43:53 -07:00
Brian Behlendorf
c3cdcce985
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:47 -07:00
Brian Behlendorf
982dc2a6f0
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-09 16:43:45 -07:00
Brian Behlendorf
fc9f0b6354
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:39 -07:00
Brian Behlendorf
10cb050e20
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-09 16:43:37 -07:00
Brian Behlendorf
c5d942b1eb
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:31 -07:00
Brian Behlendorf
7d9b89f749
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-09 16:43:29 -07:00
Brian Behlendorf
ac96b6e281
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:23 -07:00
Brian Behlendorf
a1af33894c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-09 16:43:21 -07:00
Brian Behlendorf
d5f3570012
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:15 -07:00
Brian Behlendorf
bbe79ef2eb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-09 16:43:13 -07:00
Brian Behlendorf
6edf51dcd1
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:07 -07:00
Brian Behlendorf
f9291ee05a
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-09 16:43:06 -07:00
Brian Behlendorf
fe812499af
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-09 16:43:05 -07:00
Brian Behlendorf
724b61b653
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-09 16:42:54 -07:00
Brian Behlendorf
3811cc77d6
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-09 16:42:52 -07:00
Brian Behlendorf
97de984e0f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-09 16:42:51 -07:00
Brian Behlendorf
c07aa8430d
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-09 16:42:41 -07:00
Brian Behlendorf
303c79534a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-09 16:42:39 -07:00
Brian Behlendorf
f868562fd4
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-09 16:42:33 -07:00
Brian Behlendorf
0af48bcf91
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-09 16:42:31 -07:00
Brian Behlendorf
b4a732e620
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-10-09 16:42:25 -07:00
Brian Behlendorf
c4dff3c807
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-10-09 16:42:23 -07:00
Brian Behlendorf
7303103ba3
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-09 16:42:17 -07:00
