dc947cc633
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-05-22 09:38:30 -07:00
4e83b5fbd0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-05-22 09:38:28 -07:00
58e79ca80a
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-05-22 09:38:23 -07:00
7ac3be294a
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-05-22 09:38:21 -07:00
875c5a6d53
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-05-22 09:38:16 -07:00
0ade7e7652
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-05-22 09:38:15 -07:00
ac5fd0cf8e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-05-22 09:38:14 -07:00
1076581e14
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-05-22 09:38:05 -07:00
b19c782856
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-05-22 09:38:03 -07:00
dd1c357f20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-05-22 09:38:03 -07:00
bf56f4bc4c
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:53 -07:00
6bacf2bd0a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-05-22 09:37:52 -07:00
cb6e5340f2
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:47 -07:00
016306198f
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-05-22 09:37:45 -07:00
cc3ab06a61
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:40 -07:00
af5fd5951f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-05-22 09:37:38 -07:00
d7f3e29f44
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:33 -07:00
9f88344c51
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-05-22 09:37:31 -07:00
e101ce019c
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:26 -07:00
c732409f16
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-05-22 09:37:25 -07:00
e2dda8c75e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:19 -07:00
29974ed419
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-05-22 09:37:18 -07:00
479687ad0d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-05-22 09:37:13 -07:00
563a356430
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-05-22 09:37:11 -07:00
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
f97758adcf
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-20 14:40:55 -07:00
3edfdedd08
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-20 14:40:52 -07:00
d791170ab7
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-20 14:40:37 -07:00
a362fafd5d
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-20 14:40:35 -07:00
0fc354a81a
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-20 14:40:25 -07:00
47a15c09b5
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-20 14:40:23 -07:00
13ce0df07a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-20 14:40:13 -07:00
73c605353b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-20 14:40:10 -07:00
9dcf0184ad
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:56 -07:00
b1c92da6bb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-20 14:39:54 -07:00
5e818782e8
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:44 -07:00
09073d6817
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-20 14:39:42 -07:00
b8c0cd1e07
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:32 -07:00
7a17ae41fd
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-20 14:39:27 -07:00
62a265159e
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:15 -07:00
4b46edf2a8
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-20 14:39:13 -07:00
425597a66f
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-20 14:39:03 -07:00
083950da84
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-20 14:39:00 -07:00
7769efe613
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-20 14:38:49 -07:00
8448a028fd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-20 14:38:46 -07:00
9c37bfe4ab
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-20 14:38:33 -07:00
22a02ed4cc
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-20 14:38:31 -07:00
016c6d3672
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-20 14:38:21 -07:00
cc0a52c939
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 14:38:19 -07:00
daa5c38101
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 14:38:18 -07:00
Brian Behlendorf