Brian Behlendorf
c732409f16
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-05-22 09:37:25 -07:00
Brian Behlendorf
e2dda8c75e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:19 -07:00
Brian Behlendorf
29974ed419
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-05-22 09:37:18 -07:00
Brian Behlendorf
479687ad0d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:13 -07:00
Brian Behlendorf
563a356430
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-05-22 09:37:11 -07:00
Brian Behlendorf
d855b57b7c
SLES Fixes (Part 1):
...
- ZFS_AC_KERNEL updated to exclude -obj entries in /usr/src/ when
attempting to automatically detect your kernel source.
- ZFS_AC_KERNEL check for *-obj directory when attempting to
detect the objects for your kernel source.
- ZFS_AC_SPL updated to additionally check for Modules.symvers build
product. This seems to be specific to SLES system, for Vanilla,
Fedora, RHEL, and Chaos kernels the symbol file is just called
Module.symvers.
- ZFS_CHECK_SYMBOL_EXPORT also should also check the exported SPL
symbols in addition to the exported core kernel systems.
2009-05-22 09:26:36 -07:00
Brian Behlendorf
f97758adcf
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-20 14:40:55 -07:00
Brian Behlendorf
3edfdedd08
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-20 14:40:52 -07:00
Brian Behlendorf
d791170ab7
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-20 14:40:37 -07:00
Brian Behlendorf
a362fafd5d
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-20 14:40:35 -07:00
Brian Behlendorf
0fc354a81a
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-20 14:40:25 -07:00
Brian Behlendorf
47a15c09b5
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-20 14:40:23 -07:00
Brian Behlendorf
13ce0df07a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-20 14:40:13 -07:00
Brian Behlendorf
73c605353b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-20 14:40:10 -07:00
Brian Behlendorf
9dcf0184ad
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:56 -07:00
Brian Behlendorf
b1c92da6bb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-20 14:39:54 -07:00
Brian Behlendorf
5e818782e8
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:44 -07:00
Brian Behlendorf
09073d6817
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-20 14:39:42 -07:00
Brian Behlendorf
b8c0cd1e07
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:32 -07:00
Brian Behlendorf
7a17ae41fd
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-20 14:39:27 -07:00
Brian Behlendorf
62a265159e
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:15 -07:00
Brian Behlendorf
4b46edf2a8
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-20 14:39:13 -07:00
Brian Behlendorf
425597a66f
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:03 -07:00
Brian Behlendorf
083950da84
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-20 14:39:00 -07:00
Brian Behlendorf
7769efe613
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-20 14:38:49 -07:00
Brian Behlendorf
8448a028fd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-20 14:38:46 -07:00
Brian Behlendorf
9c37bfe4ab
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-20 14:38:33 -07:00
Brian Behlendorf
22a02ed4cc
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-20 14:38:31 -07:00
Brian Behlendorf
016c6d3672
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-20 14:38:21 -07:00
Brian Behlendorf
cc0a52c939
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 14:38:19 -07:00
Brian Behlendorf
daa5c38101
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 14:38:18 -07:00
Brian Behlendorf
5f181b6527
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-20 14:37:59 -07:00
Brian Behlendorf
3370bedfde
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-20 14:37:57 -07:00
Brian Behlendorf
a08ea6e0a7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-20 14:37:56 -07:00
Brian Behlendorf
4da9311999
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-20 14:37:38 -07:00
Brian Behlendorf
30e8c7593a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-20 14:37:34 -07:00
Brian Behlendorf
ec485f17be
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-20 14:37:23 -07:00
Brian Behlendorf
6b45777d1c
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-20 14:37:21 -07:00
Brian Behlendorf
1d9e44b2a9
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-20 14:37:11 -07:00
Brian Behlendorf
087feffb2a
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-20 14:37:09 -07:00
Brian Behlendorf
4d4fcbc437
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-20 14:36:59 -07:00
Brian Behlendorf
4ffbd4bd4d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-20 14:36:56 -07:00
Brian Behlendorf
7e3dd58c45
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-20 14:36:44 -07:00
Brian Behlendorf
9db0282365
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-20 14:36:42 -07:00
Brian Behlendorf
03f539480f
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-20 14:36:32 -07:00
Brian Behlendorf
38c5ab615f
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-20 14:36:29 -07:00
Brian Behlendorf
88c6077052
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-20 14:36:19 -07:00
Brian Behlendorf
f82d006beb
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-20 14:36:17 -07:00
Brian Behlendorf
d83c361158
Prep for zfs-0.4.3 tag (Fix spelling)
2009-03-20 14:28:17 -07:00
Brian Behlendorf
1c7875c78c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-20 14:25:13 -07:00